Title: [112552] trunk/Tools
- Revision
- 112552
- Author
- [email protected]
- Date
- 2012-03-29 11:27:41 -0700 (Thu, 29 Mar 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (112551 => 112552)
--- trunk/Tools/ChangeLog 2012-03-29 18:24:45 UTC (rev 112551)
+++ trunk/Tools/ChangeLog 2012-03-29 18:27:41 UTC (rev 112552)
@@ -1,3 +1,17 @@
+2012-03-29 Ilya Tikhonovsky <[email protected]>
+
+ 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 <[email protected]>
Remove custom bindings form Internals.idl of attribute type Array.
Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (112551 => 112552)
--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-03-29 18:24:45 UTC (rev 112551)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp 2012-03-29 18:27:41 UTC (rev 112552)
@@ -131,6 +131,12 @@
WebRuntimeFeatures::enableShadowDOM(true);
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;
}
void TestShell::initialize()
@@ -154,12 +160,6 @@
} 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();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
