Changeset 112552 in webkit

Timestamp:

Mar 29, 2012 11:27:41 AM (12 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: chromium: DRT --no-timeout option doesn't work.
​https://bugs.webkit.org/show_bug.cgi?id=82608

Initial value for m_timeout was initialized in constructor and was overwritten in DRT::main.
This was broken by r112354 and the sequence became opposite.

Reviewed by Yury Semikhatsky.

• DumpRenderTree/chromium/TestShell.cpp:

(TestShell::TestShell):
(TestShell::initialize):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/TestShell.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-29  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: chromium: DRT --no-timeout option doesn't work.
+        https://bugs.webkit.org/show_bug.cgi?id=82608
+
+        Initial value for m_timeout was initialized in constructor and was overwritten in DRT::main.
+        This was broken by r112354 and the sequence became opposite.
+
+        Reviewed by Yury Semikhatsky.
+
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::TestShell):
+        (TestShell::initialize):
+
 2012-03-29  Vineet Chaudhary  <rgf748@motorola.com>
 

trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

@@ -132 +132 @@
     WebRuntimeFeatures::enableStyleScoped(true);
     WebRuntimeFeatures::enableScriptedSpeech(true);
+
+    // 30 second is the same as the value in Mac DRT.
+    // If we use a value smaller than the timeout value of
+    // (new-)run-webkit-tests, (new-)run-webkit-tests misunderstands that a
+    // timed-out DRT process was crashed.
+    m_timeout = 30 * 1000;
 }
 
@@ -154 +160 @@
     } else
         WebCompositor::initialize(0);
-
-    // 30 second is the same as the value in Mac DRT.
-    // If we use a value smaller than the timeout value of
-    // (new-)run-webkit-tests, (new-)run-webkit-tests misunderstands that a
-    // timed-out DRT process was crashed.
-    m_timeout = 30 * 1000;
 
     createMainWindow();