summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/focus2-expected.txt7
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt2
2 files changed, 7 insertions, 2 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/focus2-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/focus2-expected.txt
index 1311fd2..93a8239 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/focus2-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/forms/focus2-expected.txt
@@ -22,6 +22,9 @@ blur event: [to] ISINDEX
focus event: [to] PASSWORD
keydown event: [to] PASSWORD
blur event: [to] PASSWORD
+focus event: [to] RADIO
+keydown event: [to] RADIO
+blur event: [to] RADIO
focus event: [to] RANGE
keydown event: [to] RANGE
blur event: [to] RANGE
@@ -65,6 +68,9 @@ blur event: [to] ISINDEX
focus event: [to] PASSWORD
keydown event: [to] PASSWORD
blur event: [to] PASSWORD
+focus event: [to] RADIO
+keydown event: [to] RADIO
+blur event: [to] RADIO
focus event: [to] RANGE
keydown event: [to] RANGE
blur event: [to] RANGE
@@ -87,4 +93,3 @@ focus event: [to] DIV
keydown event: [to] DIV
blur event: [to] DIV
focus event: [to] BUTTON
-
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 8b186ec..00373f7 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -334,6 +334,7 @@ DEFER : LayoutTests/http/tests/navigation/changing-frame-hierarchy-in-onload.htm
// rebaseline on other platforms as well.
DEFER LINUX : LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html = FAIL
LINUX MAC : LayoutTests/fast/dynamic/insert-before-table-part-in-continuation.html = FAIL
+LINUX : LayoutTests/fast/forms/focus2.html = FAIL
MAC : LayoutTests/fast/parser/open-comment-in-textarea.html = FAIL
LINUX : LayoutTests/fast/text/international/wrap-CJK-001.html = FAIL
// Font differences, requiring overriden metrics, not a real bug, not fixing for Beta
@@ -1672,7 +1673,6 @@ SKIP : LayoutTests/transitions/zero-duration-with-non-zero-delay-end.html = TIME
// Merge 39744:39829 - new tests
WIN LINUX : LayoutTests/fast/canvas/canvas-incremental-repaint-2.html = FAIL
LayoutTests/fast/encoding/char-encoding-mac.html = FAIL
-WIN LINUX : LayoutTests/fast/forms/focus2.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