Changeset 104902 in webkit

Timestamp:

Jan 13, 2012 12:47:04 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Mac][DRT] Should support --no-timeout
​https://bugs.webkit.org/show_bug.cgi?id=76242

Patch by Hajime Morrita <​morrita@chromium.org> on 2012-01-13
Reviewed by Darin Adler.

• DumpRenderTree/mac/DumpRenderTree.mm:

(initializeGlobalsFromCommandLineOptions): Added "--no-timeout" to the options list.
(setWaitToDumpWatchdog): Added to encapsulate the waitToDumpWatchdog global variable.
(shouldSetWaitToDumpWatchdog): Added to check the useTimeoutWatchdog flag set by the option.

• DumpRenderTree/mac/DumpRenderTreeMac.h:
• DumpRenderTree/mac/LayoutTestControllerMac.mm:

(LayoutTestController::setWaitToDump): Now calls shouldSetWaitToDumpWatchdog() to check the flag.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/DumpRenderTree.mm (modified) (4 diffs)
• DumpRenderTree/mac/DumpRenderTreeMac.h (modified) (1 diff)
• DumpRenderTree/mac/LayoutTestControllerMac.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-01-13  Hajime Morrita  <morrita@chromium.org>
+
+        [Mac][DRT] Should support --no-timeout
+        https://bugs.webkit.org/show_bug.cgi?id=76242
+
+        Reviewed by Darin Adler.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (initializeGlobalsFromCommandLineOptions): Added "--no-timeout" to the options list.
+        (setWaitToDumpWatchdog): Added to encapsulate the waitToDumpWatchdog global variable.
+        (shouldSetWaitToDumpWatchdog): Added to check the useTimeoutWatchdog flag set by the option.
+        * DumpRenderTree/mac/DumpRenderTreeMac.h:
+        * DumpRenderTree/mac/LayoutTestControllerMac.mm:
+        (LayoutTestController::setWaitToDump): Now calls shouldSetWaitToDumpWatchdog() to check the flag.
+
 2012-01-12  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -130 +130 @@
 
 CFMutableSetRef disallowedURLs = 0;
-CFRunLoopTimerRef waitToDumpWatchdog = 0;
+static CFRunLoopTimerRef waitToDumpWatchdog = 0;
 
 // Delegates
@@ -144 +144 @@
 static int threaded;
 static int dumpTree = YES;
+static int useTimeoutWatchdog = YES;
 static int forceComplexText;
 static int gcBetweenTests;
@@ -766 +767 @@
         {"complex-text", no_argument, &forceComplexText, YES},
         {"gc-between-tests", no_argument, &gcBetweenTests, YES},
+        {"no-timeout", no_argument, &useTimeoutWatchdog, NO},
         {NULL, 0, NULL, 0}
     };
@@ -1100 +1102 @@
         waitToDumpWatchdog = 0;
     }
+}
+
+void setWaitToDumpWatchdog(CFRunLoopTimerRef timer)
+{
+    ASSERT(timer);
+    ASSERT(shouldSetWaitToDumpWatchdog());
+    waitToDumpWatchdog = timer;
+    CFRunLoopAddTimer(CFRunLoopGetCurrent(), waitToDumpWatchdog, kCFRunLoopCommonModes);
+}
+
+bool shouldSetWaitToDumpWatchdog()
+{
+    return !waitToDumpWatchdog && useTimeoutWatchdog;
 }
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMac.h

@@ -62 +62 @@
 extern const unsigned maxViewWidth;
 
-extern CFRunLoopTimerRef waitToDumpWatchdog;
+void setWaitToDumpWatchdog(CFRunLoopTimerRef);
+bool shouldSetWaitToDumpWatchdog();
 
 WebView* createWebViewAndOffscreenWindow();

trunk/Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm

@@ -725 +725 @@
 {
     m_waitToDump = waitUntilDone;
-    if (m_waitToDump && !waitToDumpWatchdog) {
-        waitToDumpWatchdog = CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + waitToDumpWatchdogInterval, 0, 0, 0, waitUntilDoneWatchdogFired, NULL);
-        CFRunLoopAddTimer(CFRunLoopGetCurrent(), waitToDumpWatchdog, kCFRunLoopCommonModes);
-    }
+    if (m_waitToDump && shouldSetWaitToDumpWatchdog())
+        setWaitToDumpWatchdog(CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + waitToDumpWatchdogInterval, 0, 0, 0, waitUntilDoneWatchdogFired, NULL));
 }