summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-18 20:32:33 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-18 20:32:33 +0000
commitac09c92224d0ee428b2c667841e5ba007075e5c3 (patch)
tree783ef9ce4073dc29c5d8bf23254d1891d63db3b9 /webkit
parent1ef5ad42064c8ef0d1503b68a7fbac01887ca093 (diff)
downloadchromium_src-ac09c92224d0ee428b2c667841e5ba007075e5c3.zip
chromium_src-ac09c92224d0ee428b2c667841e5ba007075e5c3.tar.gz
chromium_src-ac09c92224d0ee428b2c667841e5ba007075e5c3.tar.bz2
Make change to our LayoutTestController to match the change I made upstream to
DumpRenderTree's version in http://trac.webkit.org/changeset/42623 This change makes it so that we do not finish the test until all loading stops. R=dglazkov Review URL: http://codereview.chromium.org/79079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/layout_test_controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc
index a7a4d25..70d6163 100644
--- a/webkit/tools/test_shell/layout_test_controller.cc
+++ b/webkit/tools/test_shell/layout_test_controller.cc
@@ -176,7 +176,7 @@ void LayoutTestController::WorkQueue::ProcessWork() {
return;
}
- if (!wait_until_done_)
+ if (!wait_until_done_ && !shell_->delegate()->top_loading_frame())
shell_->TestFinished();
}