diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 7 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_win.cc | 18 |
2 files changed, 13 insertions, 12 deletions
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index b332e94..d0746227 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -758,9 +758,8 @@ DEFER LINUX WIN : LayoutTests/editing/selection/caret-rtl-2.html = FAIL DEFER WIN : LayoutTests/fast/dom/resource-locations-in-created-html-document.html = FAIL DEBUG : LayoutTests/http/tests/messaging/cross-domain-message-event-dispatch.html = FAIL PASS TIMEOUT -// This is failing occasionally because we're dumping the tree/image -// before the redirect completes. -LayoutTests/http/tests/navigation/metaredirect-basic.html = FAIL +// See recent changes to test_shell_win. +LINUX MAC : LayoutTests/http/tests/navigation/metaredirect-basic.html = FAIL // GURL/KURL difference in handling of "http:". http://crbug.com/7386. // New test. We should fix it, but it doesn't need to block the current release @@ -1752,9 +1751,7 @@ MAC RELEASE : LayoutTests/fast/events/scrollbar-double-click.html = TIMEOUT // Regressions from WebKit merge 40847-40875 LINUX WIN : LayoutTests/fast/box-shadow/basic-shadows.html = FAIL MAC LINUX WIN : LayoutTests/fast/forms/textarea-scrolled-endline-caret.html = FAIL PASS -WIN : LayoutTests/http/tests/navigation/javascriptlink-frames.html = FAIL WIN : LayoutTests/http/tests/navigation/javascriptlink-subframeload.html = FAIL PASS -WIN : LayoutTests/http/tests/navigation/metaredirect-frames.html = FAIL WIN : LayoutTests/http/tests/navigation/metaredirect-subframeload.html = FAIL PASS WIN : LayoutTests/http/tests/navigation/redirect302-subframeload.html = FAIL PASS WIN : LayoutTests/http/tests/navigation/success200-frames-loadsame.html = FAIL PASS diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 9968fa6..045c8b8 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -231,13 +231,6 @@ bool TestShell::RunFileTest(const TestParams& params) { HWND hwnd = *(TestShell::windowList()->begin()); TestShell* shell = static_cast<TestShell*>(win_util::GetWindowUserData(hwnd)); - shell->ResetTestController(); - - // ResetTestController may have closed the window we were holding on to. - // Grab the first window again. - hwnd = *(TestShell::windowList()->begin()); - shell = static_cast<TestShell*>(win_util::GetWindowUserData(hwnd)); - DCHECK(shell); // Clear focus between tests. shell->m_focusedWidgetHost = NULL; @@ -246,6 +239,17 @@ bool TestShell::RunFileTest(const TestParams& params) { shell->webView()->StopLoading(); shell->navigation_controller()->Reset(); + // StopLoading may update state maintained in the test controller (for + // example, whether the WorkQueue is frozen) as such, we need to reset it + // after we invoke StopLoading. + shell->ResetTestController(); + + // ResetTestController may have closed the window we were holding on to. + // Grab the first window again. + hwnd = *(TestShell::windowList()->begin()); + shell = static_cast<TestShell*>(win_util::GetWindowUserData(hwnd)); + DCHECK(shell); + // Clean up state between test runs. webkit_glue::ResetBeforeTestRun(shell->webView()); ResetWebPreferences(); |