summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests/test_expectations.txt
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools/layout_tests/test_expectations.txt')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index c5557c2..99d8719 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2913,3 +2913,15 @@ BUG37869 LINUX : fast/images/animated-svg-as-image.html = IMAGE
BUG37869 MAC LINUX : inspector/timeline-network-resource.html = CRASH
BUG37869 MAC : fast/canvas/webgl/uniform-location.html = TEXT
BUG37869 MAC : editing/input/option-page-up-down.html = TIMEOUT
+
+// WebKit merge 55791:55819
+BUG_JAPHET MAC : fast/canvas/webgl/uniform-location.html = TEXT
+BUG_JAPHET MAC : fast/css/getComputedStyle/computed-style-without-renderer.html = TEXT
+BUG_JAPHET MAC : fast/css/getComputedStyle/computed-style.html = TEXT
+BUG_JAPHET MAC : fast/dom/Window/window-appendages-cleared.html = TEXT
+BUG_JAPHET : fast/events/spatial-navigation/snav-fully-aligned-horizontally.html = TEXT
+BUG_JAPHET : fast/events/spatial-navigation/snav-fully-aligned-vertically.html = TEXT
+BUG_JAPHET : fast/events/spatial-navigation/snav-iframe-no-focusable-content.html = TEXT
+BUG_JAPHET : fast/events/spatial-navigation/snav-iframe-no-scrollable-content.html = TEXT
+BUG_JAPHET : fast/events/spatial-navigation/snav-iframe-with-offscreen-focusable-element.html = TEXT
+BUG_JAPHET : fast/events/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html = TEXT