Title: [145072] trunk/Tools
Revision
145072
Author
joc...@chromium.org
Date
2013-03-07 07:20:00 -0800 (Thu, 07 Mar 2013)

Log Message

[chromium] don't track the top loading frame if no layout test is currently running
https://bugs.webkit.org/show_bug.cgi?id=111716

Reviewed by Kentaro Hara.

In DRT, we synchronously stop the test and start loading the next test
URL. However, in content_shell, this happens asynchronously. It's
important that the top loading frame is not changed due to stray
navigation events before the next test starts.

* DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
(WebTestRunner::TestRunner::setTopLoadingFrame):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (145071 => 145072)


--- trunk/Tools/ChangeLog	2013-03-07 14:23:27 UTC (rev 145071)
+++ trunk/Tools/ChangeLog	2013-03-07 15:20:00 UTC (rev 145072)
@@ -1,3 +1,18 @@
+2013-03-07  Jochen Eisinger  <joc...@chromium.org>
+
+        [chromium] don't track the top loading frame if no layout test is currently running
+        https://bugs.webkit.org/show_bug.cgi?id=111716
+
+        Reviewed by Kentaro Hara.
+
+        In DRT, we synchronously stop the test and start loading the next test
+        URL. However, in content_shell, this happens asynchronously. It's
+        important that the top loading frame is not changed due to stray
+        navigation events before the next test starts.
+
+        * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
+        (WebTestRunner::TestRunner::setTopLoadingFrame):
+
 2013-03-06  Julie Parent  <jpar...@chromium.org>
 
         Dashboard cleanup: Move all dashboard ui related code into ui.js.

Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp (145071 => 145072)


--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp	2013-03-07 14:23:27 UTC (rev 145071)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp	2013-03-07 15:20:00 UTC (rev 145072)
@@ -634,6 +634,8 @@
 {
     if (frame->top()->view() != m_webView)
         return;
+    if (!m_testIsRunning)
+        return;
     if (clear) {
         m_topLoadingFrame = 0;
         locationChangeDone();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to