diff options
9 files changed, 9 insertions, 18 deletions
diff --git a/webkit/data/layout_test_results/common/LayoutTests/fast/events/frame-click-focus-expected.txt b/webkit/data/layout_test_results/common/LayoutTests/fast/events/frame-click-focus-expected.txt deleted file mode 100644 index 3e405a7..0000000 --- a/webkit/data/layout_test_results/common/LayoutTests/fast/events/frame-click-focus-expected.txt +++ /dev/null @@ -1,9 +0,0 @@ -This page tests that frames receive focus events when a click occurs within their content area, and blur events when a click occurs outside their content area. - -To test, click in the frame and then click on this text. - -main frame focused -main frame blurred -iframe focused -iframe blurred -main frame focused diff --git a/webkit/data/layout_test_results/v8/LayoutTests/editing/pasteboard/testcase-9507-expected.checksum b/webkit/data/layout_test_results/v8/LayoutTests/editing/pasteboard/testcase-9507-expected.checksum index 428d116..5215727 100644 --- a/webkit/data/layout_test_results/v8/LayoutTests/editing/pasteboard/testcase-9507-expected.checksum +++ b/webkit/data/layout_test_results/v8/LayoutTests/editing/pasteboard/testcase-9507-expected.checksum @@ -1 +1 @@ -c27c2ce26ef763b573add791fe8c705a
\ No newline at end of file +aa14ebc0c8c526df51f0cce4b2cc25b0
\ No newline at end of file diff --git a/webkit/data/layout_test_results/v8/LayoutTests/editing/pasteboard/testcase-9507-expected.png b/webkit/data/layout_test_results/v8/LayoutTests/editing/pasteboard/testcase-9507-expected.png Binary files differindex 37161e8..2945d3a 100644 --- a/webkit/data/layout_test_results/v8/LayoutTests/editing/pasteboard/testcase-9507-expected.png +++ b/webkit/data/layout_test_results/v8/LayoutTests/editing/pasteboard/testcase-9507-expected.png diff --git a/webkit/data/layout_test_results/v8/LayoutTests/editing/selection/4983858-expected.checksum b/webkit/data/layout_test_results/v8/LayoutTests/editing/selection/4983858-expected.checksum index 0b3052f..e134d15 100644 --- a/webkit/data/layout_test_results/v8/LayoutTests/editing/selection/4983858-expected.checksum +++ b/webkit/data/layout_test_results/v8/LayoutTests/editing/selection/4983858-expected.checksum @@ -1 +1 @@ -1be97097ab7dfb91440d97076744a346
\ No newline at end of file +6ffbbebf40220bd726d54b6cc7258c5a
\ No newline at end of file diff --git a/webkit/data/layout_test_results/v8/LayoutTests/editing/selection/4983858-expected.png b/webkit/data/layout_test_results/v8/LayoutTests/editing/selection/4983858-expected.png Binary files differindex d10722f..2e59077 100644 --- a/webkit/data/layout_test_results/v8/LayoutTests/editing/selection/4983858-expected.png +++ b/webkit/data/layout_test_results/v8/LayoutTests/editing/selection/4983858-expected.png diff --git a/webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/4776765-expected.checksum b/webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/4776765-expected.checksum index ff743a0..55af48b 100644 --- a/webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/4776765-expected.checksum +++ b/webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/4776765-expected.checksum @@ -1 +1 @@ -120d895cbf436fa39cc05320b310a7a9
\ No newline at end of file +5ae47ce5ce235ad5dc778c9286785f62
\ No newline at end of file diff --git a/webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/4776765-expected.png b/webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/4776765-expected.png Binary files differindex e471ca9..21f897b 100644 --- a/webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/4776765-expected.png +++ b/webkit/data/layout_test_results/v8/LayoutTests/fast/repaint/4776765-expected.png diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index 952a91d..abdc4b6 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -516,12 +516,6 @@ V8 # LayoutTests/fast/dom/getter-on-window-object2.html = FAIL // We don't support WebKit-Editing-Delete-Button V8 | KJS # LayoutTests/editing/deleting/5408255.html = FAIL -// Bug: 845337 -// Missing two callbacks: -// -EDITING DELEGATE: shouldBeginEditingInDOMRange:range ... -// -EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification -V8 | KJS # LayoutTests/editing/pasteboard/testcase-9507.html = FAIL - // Bug: 1042838 // User stylesheets not currently supported by chrome. // Webkit supports them by doing filesystem operations directly. diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index fb23b5f..fdd8e46 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -871,6 +871,12 @@ bool TestShell::Navigate(const TestNavigationEntry& entry, bool reload) { // back/forward navigations maintain the target frame? frame->LoadRequest(request.get()); + // Restore focus to the main frame prior to loading new request. + // This makes sure that we don't have a focused iframe. Otherwise, that + // iframe would keep focus when the SetFocus called immediately after + // LoadRequest, thus making some tests fail (see http://b/issue?id=845337 + // for more details). + webView()->SetFocusedFrame(frame); SetFocus(webViewHost(), true); return true; |
