Title: [278805] trunk/Tools
- Revision
- 278805
- Author
- hironori.fu...@sony.com
- Date
- 2021-06-11 19:30:49 -0700 (Fri, 11 Jun 2021)
Log Message
[Win][DumpRenderTree] --no-timeout switch doesn't work
https://bugs.webkit.org/show_bug.cgi?id=226913
Reviewed by Don Olmstead.
r177542 added a variable 'useTimeoutWatchdog', but used nowhere.
* DumpRenderTree/win/DumpRenderTree.cpp:
* DumpRenderTree/win/DumpRenderTreeWin.h:
* DumpRenderTree/win/TestRunnerWin.cpp:
(TestRunner::setWaitToDump): Check useTimeoutWatchdog to start the timer.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (278804 => 278805)
--- trunk/Tools/ChangeLog 2021-06-12 01:42:32 UTC (rev 278804)
+++ trunk/Tools/ChangeLog 2021-06-12 02:30:49 UTC (rev 278805)
@@ -1,3 +1,17 @@
+2021-06-11 Fujii Hironori <hironori.fu...@sony.com>
+
+ [Win][DumpRenderTree] --no-timeout switch doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=226913
+
+ Reviewed by Don Olmstead.
+
+ r177542 added a variable 'useTimeoutWatchdog', but used nowhere.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ * DumpRenderTree/win/DumpRenderTreeWin.h:
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::setWaitToDump): Check useTimeoutWatchdog to start the timer.
+
2021-06-11 Ryosuke Niwa <rn...@webkit.org>
Add WeakHashMap
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (278804 => 278805)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2021-06-12 01:42:32 UTC (rev 278804)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2021-06-12 02:30:49 UTC (rev 278805)
@@ -101,7 +101,6 @@
static bool dumpPixelsForCurrentTest = false;
static bool threaded = false;
static bool dumpTree = true;
-static bool useTimeoutWatchdog = true;
static bool forceComplexText = false;
static bool dumpAllPixels;
static bool useAcceleratedDrawing = true; // Not used
@@ -133,6 +132,7 @@
RefPtr<TestRunner> gTestRunner;
UINT_PTR waitToDumpWatchdog = 0;
+bool useTimeoutWatchdog = true;
void setPersistentUserStyleSheetLocation(CFStringRef url)
{
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTreeWin.h (278804 => 278805)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTreeWin.h 2021-06-12 01:42:32 UTC (rev 278804)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTreeWin.h 2021-06-12 02:30:49 UTC (rev 278805)
@@ -65,6 +65,7 @@
unsigned worldIDForWorld(IWebScriptWorld*);
extern UINT_PTR waitToDumpWatchdog;
+extern bool useTimeoutWatchdog;
extern COMPtr<FrameLoadDelegate> sharedFrameLoadDelegate;
Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (278804 => 278805)
--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2021-06-12 01:42:32 UTC (rev 278804)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2021-06-12 02:30:49 UTC (rev 278805)
@@ -799,7 +799,7 @@
void TestRunner::setWaitToDump(bool waitUntilDone)
{
m_waitToDump = waitUntilDone;
- if (m_waitToDump && !waitToDumpWatchdog)
+ if (m_waitToDump && !waitToDumpWatchdog && useTimeoutWatchdog)
waitToDumpWatchdog = SetTimer(0, 0, m_timeout, waitUntilDoneWatchdogFired);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
