summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt3
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_ignored.txt3
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 0d9eeaa..5df56dd 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1622,9 +1622,6 @@ SKIP : LayoutTests/fast/events/pointer-events.html = FAIL
// Merge 39744:39829 - new tests
WIN LINUX : LayoutTests/fast/canvas/canvas-incremental-repaint-2.html = FAIL
-// This tests legacy mac encodings of form input values as part of URLs.
-// http://crbug.com/7388.
-LayoutTests/fast/encoding/char-encoding-mac.html = FAIL
WIN LINUX : LayoutTests/fast/repaint/transform-disable-layoutstate.html = FAIL
// Merge 39744:39829 - regression likely due to bad implementation of RenderPath::strokeContains in PathSkia.cpp
diff --git a/webkit/tools/layout_tests/test_lists/tests_ignored.txt b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
index a82bd29..5e7b21a 100644
--- a/webkit/tools/layout_tests/test_lists/tests_ignored.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
@@ -14,6 +14,9 @@
// permanently expected to fail.
SKIP : LayoutTests/dom/xhtml = PASS
+// We do not want to support Legacy mac encodings on Windows/Linux.
+SKIP WIN LINUX : LayoutTests/fast/encoding/char-encoding-mac.html = FAIL
+
// Fails due to different window.close() rules. See bug 753420. We need
// to decide whether we ever expect to pass this. Now also timing out.
SKIP : LayoutTests/fast/dom/open-and-close-by-DOM.html = FAIL