Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Unified Diff: webkit/tools/test_shell/test_shell_win.cc

Issue 27109: Fixes bug in test shell. We were invoking ResetTestController before... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/layout_tests/test_lists/tests_fixable.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell_win.cc
===================================================================
--- webkit/tools/test_shell/test_shell_win.cc (revision 10292)
+++ webkit/tools/test_shell/test_shell_win.cc (working copy)
@@ -231,10 +231,7 @@
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());
tony 2009/02/24 23:33:45 Nit: Should we move these three lines and the comm
shell = static_cast<TestShell*>(win_util::GetWindowUserData(hwnd));
DCHECK(shell);
@@ -246,6 +243,11 @@
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();
+
// Clean up state between test runs.
webkit_glue::ResetBeforeTestRun(shell->webView());
ResetWebPreferences();
« no previous file with comments | « webkit/tools/layout_tests/test_lists/tests_fixable.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698