<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[235399] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/235399">235399</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2018-08-27 14:11:22 -0700 (Mon, 27 Aug 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Convert timeout values in WebKitTestRunner to WTF::Seconds
https://bugs.webkit.org/show_bug.cgi?id=188987

Reviewed by Ryosuke Niwa.

Replace various 'int' timeout values with WTF::Seconds. The timeout argument
comes in as milliseconds, so convert on input. When sending messages to the InjectedBundle
using integers, convert to and from milliseconds.

Also do some #pragma once, and initializer cleanup.

* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::didReceiveMessageToPage):
(WTR::InjectedBundle::beginTesting):
(WTR::InjectedBundle::InjectedBundle): Deleted.
* WebKitTestRunner/InjectedBundle/InjectedBundle.h:
* WebKitTestRunner/InjectedBundle/TestRunner.h:
(WTR::TestRunner::timeout):
(WTR::TestRunner::setCustomTimeout):
* WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
(WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
* WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm:
(WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
(WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
* WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp:
(WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::TestController):
(WTR::parseInputLine):
(WTR::TestController::runTest):
(WTR::TestController::runUntil):
(WTR::TestController::didReceiveMessageFromInjectedBundle):
* WebKitTestRunner/TestController.h:
* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::shortTimeout const):
(WTR::TestInvocation::createTestSettingsDictionary):
* WebKitTestRunner/TestInvocation.h:
* WebKitTestRunner/TestOptions.h:
* WebKitTestRunner/cocoa/TestControllerCocoa.mm:
(WTR::TestController::platformRunUntil):
* WebKitTestRunner/gtk/TestControllerGtk.cpp:
(WTR::TestController::platformRunUntil):
* WebKitTestRunner/wpe/TestControllerWPE.cpp:
(WTR::TestController::platformRunUntil):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleInjectedBundleh">trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlegtkTestRunnerGtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacTestRunnerMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlewpeTestRunnerWPEcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllerh">trunk/Tools/WebKitTestRunner/TestController.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationcpp">trunk/Tools/WebKitTestRunner/TestInvocation.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestInvocationh">trunk/Tools/WebKitTestRunner/TestInvocation.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestOptionsh">trunk/Tools/WebKitTestRunner/TestOptions.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnercocoaTestControllerCocoamm">trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnergtkTestControllerGtkcpp">trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerwpeTestControllerWPEcpp">trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/ChangeLog       2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -1,3 +1,97 @@
</span><ins>+2018-08-27  Simon Fraser  <simon.fraser@apple.com>
+
+        Convert timeout values in WebKitTestRunner to WTF::Seconds
+        https://bugs.webkit.org/show_bug.cgi?id=188987
+
+        Reviewed by Ryosuke Niwa.
+        
+        Replace various 'int' timeout values with WTF::Seconds. The timeout argument
+        comes in as milliseconds, so convert on input. When sending messages to the InjectedBundle
+        using integers, convert to and from milliseconds.
+        
+        Also do some #pragma once, and initializer cleanup.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::didReceiveMessageToPage):
+        (WTR::InjectedBundle::beginTesting):
+        (WTR::InjectedBundle::InjectedBundle): Deleted.
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        (WTR::TestRunner::timeout):
+        (WTR::TestRunner::setCustomTimeout):
+        * WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
+        (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
+        * WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm:
+        (WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
+        (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
+        * WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp:
+        (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::TestController):
+        (WTR::parseInputLine):
+        (WTR::TestController::runTest):
+        (WTR::TestController::runUntil):
+        (WTR::TestController::didReceiveMessageFromInjectedBundle):
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::shortTimeout const):
+        (WTR::TestInvocation::createTestSettingsDictionary):
+        * WebKitTestRunner/TestInvocation.h:
+        * WebKitTestRunner/TestOptions.h:
+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+        (WTR::TestController::platformRunUntil):
+        * WebKitTestRunner/gtk/TestControllerGtk.cpp:
+        (WTR::TestController::platformRunUntil):
+        * WebKitTestRunner/wpe/TestControllerWPE.cpp:
+        (WTR::TestController::platformRunUntil):
+
+2018-08-27  Simon Fraser  <simon.fraser@apple.com>
+
+        Convert timeout values in WebKitTestRunner to WTF::Seconds
+        https://bugs.webkit.org/show_bug.cgi?id=188987
+
+        Reviewed by Ryosuke Niwa.
+        
+        Replace various 'int' timeout values with WTF::Seconds. The timeout argument
+        comes in as milliseconds, so convert on input. When sending messages to the InjectedBundle
+        using integers, convert to and from milliseconds.
+        
+        Also do some #pragma once, and initializer cleanup.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::didReceiveMessageToPage):
+        (WTR::InjectedBundle::beginTesting):
+        (WTR::InjectedBundle::InjectedBundle): Deleted.
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
+        (WTR::TestRunner::timeout):
+        (WTR::TestRunner::setCustomTimeout):
+        * WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
+        (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
+        * WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm:
+        (WTR::TestRunner::invalidateWaitToDumpWatchdogTimer):
+        (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
+        * WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp:
+        (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::TestController):
+        (WTR::parseInputLine):
+        (WTR::TestController::runTest):
+        (WTR::TestController::runUntil):
+        (WTR::TestController::didReceiveMessageFromInjectedBundle):
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::shortTimeout const):
+        (WTR::TestInvocation::createTestSettingsDictionary):
+        * WebKitTestRunner/TestInvocation.h:
+        * WebKitTestRunner/TestOptions.h:
+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+        (WTR::TestController::platformRunUntil):
+        * WebKitTestRunner/gtk/TestControllerGtk.cpp:
+        (WTR::TestController::platformRunUntil):
+        * WebKitTestRunner/wpe/TestControllerWPE.cpp:
+        (WTR::TestController::platformRunUntil):
+
</ins><span class="cx"> 2018-08-27  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r234985/r234989) WKPageLoadHTMLString with a 16-bit String has the wrong encoding
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl      2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx">     void waitForPolicyDelegate();
</span><span class="cx">     void waitUntilDone();
</span><span class="cx">     void notifyDone();
</span><del>-    double preciseTime();
-    readonly attribute double timeout;
</del><ins>+    double preciseTime(); // seconds since the epoch
+    readonly attribute double timeout; // milliseconds
</ins><span class="cx"> 
</span><span class="cx">     // Downloads.
</span><span class="cx">     void waitUntilDownloadFinished();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp   2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp      2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -64,17 +64,6 @@
</span><span class="cx">     return shared;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-InjectedBundle::InjectedBundle()
-    : m_bundle(0)
-    , m_topLoadingFrame(0)
-    , m_state(Idle)
-    , m_dumpPixels(false)
-    , m_useWaitToDumpWatchdogTimer(true)
-    , m_useWorkQueue(false)
-    , m_timeout(0)
-{
-}
-
</del><span class="cx"> void InjectedBundle::didCreatePage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx">     static_cast<InjectedBundle*>(const_cast<void*>(clientInfo))->didCreatePage(page);
</span><span class="lines">@@ -205,7 +194,7 @@
</span><span class="cx">         m_useWaitToDumpWatchdogTimer = WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(messageBodyDictionary, useWaitToDumpWatchdogTimerKey.get())));
</span><span class="cx"> 
</span><span class="cx">         WKRetainPtr<WKStringRef> timeoutKey(AdoptWK, WKStringCreateWithUTF8CString("Timeout"));
</span><del>-        m_timeout = (int)WKUInt64GetValue(static_cast<WKUInt64Ref>(WKDictionaryGetItemForKey(messageBodyDictionary, timeoutKey.get())));
</del><ins>+        m_timeout = Seconds::fromMilliseconds(WKUInt64GetValue(static_cast<WKUInt64Ref>(WKDictionaryGetItemForKey(messageBodyDictionary, timeoutKey.get()))));
</ins><span class="cx"> 
</span><span class="cx">         WKRetainPtr<WKStringRef> dumpJSConsoleLogInStdErrKey(AdoptWK, WKStringCreateWithUTF8CString("DumpJSConsoleLogInStdErr"));
</span><span class="cx">         m_dumpJSConsoleLogInStdErr = WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(messageBodyDictionary, dumpJSConsoleLogInStdErrKey.get())));
</span><span class="lines">@@ -231,7 +220,6 @@
</span><span class="cx"> 
</span><span class="cx">         WKRetainPtr<WKStringRef> shouldGCKey(AdoptWK, WKStringCreateWithUTF8CString("ShouldGC"));
</span><span class="cx">         bool shouldGC = WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(messageBodyDictionary, shouldGCKey.get())));
</span><del>-
</del><span class="cx">         if (shouldGC)
</span><span class="cx">             WKBundleGarbageCollectJavaScriptObjects(m_bundle);
</span><span class="cx"> 
</span><span class="lines">@@ -487,7 +475,7 @@
</span><span class="cx">     m_testRunner->setTabKeyCyclesThroughElements(true);
</span><span class="cx">     m_testRunner->clearTestRunnerCallbacks();
</span><span class="cx"> 
</span><del>-    if (m_timeout > 0)
</del><ins>+    if (m_timeout > 0_s)
</ins><span class="cx">         m_testRunner->setCustomTimeout(m_timeout);
</span><span class="cx"> 
</span><span class="cx">     page()->prepare();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleInjectedBundleh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h     2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h        2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">     size_t userScriptInjectedCount() const { return m_userScriptInjectedCount; }
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    InjectedBundle();
</del><ins>+    InjectedBundle() = default;
</ins><span class="cx">     ~InjectedBundle();
</span><span class="cx"> 
</span><span class="cx">     static void didCreatePage(WKBundleRef, WKBundlePageRef, const void* clientInfo);
</span><span class="lines">@@ -170,8 +170,8 @@
</span><span class="cx"> 
</span><span class="cx">     bool booleanForKey(WKDictionaryRef, const char* key);
</span><span class="cx"> 
</span><del>-    WKBundleRef m_bundle;
-    WKBundlePageGroupRef m_pageGroup;
</del><ins>+    WKBundleRef m_bundle { nullptr };
+    WKBundlePageGroupRef m_pageGroup { nullptr };
</ins><span class="cx">     Vector<std::unique_ptr<InjectedBundlePage>> m_pages;
</span><span class="cx"> 
</span><span class="cx"> #if HAVE(ACCESSIBILITY)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx">     RefPtr<EventSendingController> m_eventSendingController;
</span><span class="cx">     RefPtr<TextInputController> m_textInputController;
</span><span class="cx"> 
</span><del>-    WKBundleFrameRef m_topLoadingFrame;
</del><ins>+    WKBundleFrameRef m_topLoadingFrame { nullptr };
</ins><span class="cx"> 
</span><span class="cx">     enum State {
</span><span class="cx">         Idle,
</span><span class="lines">@@ -189,15 +189,16 @@
</span><span class="cx">         Testing,
</span><span class="cx">         Stopping
</span><span class="cx">     };
</span><del>-    State m_state;
</del><ins>+    State m_state { Idle };
</ins><span class="cx"> 
</span><del>-    bool m_dumpPixels;
-    bool m_useWaitToDumpWatchdogTimer;
-    bool m_useWorkQueue;
-    int m_timeout;
</del><ins>+    bool m_dumpPixels { false };
+    bool m_useWaitToDumpWatchdogTimer { true };
+    bool m_useWorkQueue { false };
</ins><span class="cx">     bool m_pixelResultIsPending { false };
</span><span class="cx">     bool m_dumpJSConsoleLogInStdErr { false };
</span><span class="cx"> 
</span><ins>+    WTF::Seconds m_timeout;
+
</ins><span class="cx">     WKRetainPtr<WKDataRef> m_audioResult;
</span><span class="cx">     WKRetainPtr<WKImageRef> m_pixelResult;
</span><span class="cx">     WKRetainPtr<WKArrayRef> m_repaintRects;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h    2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include <WebKit/WKRetainPtr.h>
</span><span class="cx"> #include <string>
</span><span class="cx"> #include <wtf/Ref.h>
</span><ins>+#include <wtf/Seconds.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -71,7 +72,7 @@
</span><span class="cx">     void waitUntilDone();
</span><span class="cx">     void notifyDone();
</span><span class="cx">     double preciseTime();
</span><del>-    double timeout() { return m_timeout; }
</del><ins>+    double timeout() { return m_timeout.milliseconds(); }
</ins><span class="cx"> 
</span><span class="cx">     // Other dumping.
</span><span class="cx">     void dumpBackForwardList() { m_shouldDumpBackForwardListsForAllWindows = true; }
</span><span class="lines">@@ -315,7 +316,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool callShouldCloseOnWebView();
</span><span class="cx"> 
</span><del>-    void setCustomTimeout(int duration) { m_timeout = duration; }
</del><ins>+    void setCustomTimeout(WTF::Seconds duration) { m_timeout = duration; }
</ins><span class="cx"> 
</span><span class="cx">     // Work queue.
</span><span class="cx">     void queueBackNavigation(unsigned howFarBackward);
</span><span class="lines">@@ -512,7 +513,7 @@
</span><span class="cx">     bool m_globalFlag;
</span><span class="cx">     bool m_customFullScreenBehavior;
</span><span class="cx"> 
</span><del>-    int m_timeout;
</del><ins>+    WTF::Seconds m_timeout;
</ins><span class="cx"> 
</span><span class="cx">     double m_databaseDefaultQuota;
</span><span class="cx">     double m_databaseMaxQuota;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlegtkTestRunnerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp        2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp   2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">     if (m_waitToDumpWatchdogTimer.isActive())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    m_waitToDumpWatchdogTimer.startOneShot(1_ms * m_timeout);
</del><ins>+    m_waitToDumpWatchdogTimer.startOneShot(m_timeout);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm 2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm    2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     CFRunLoopTimerInvalidate(m_waitToDumpWatchdogTimer.get());
</span><del>-    m_waitToDumpWatchdogTimer = 0;
</del><ins>+    m_waitToDumpWatchdogTimer = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void waitUntilDoneWatchdogTimerFired(CFRunLoopTimerRef timer, void* info)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">     if (m_waitToDumpWatchdogTimer)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    CFTimeInterval interval = m_timeout / 1000.0;
</del><ins>+    CFTimeInterval interval = m_timeout.seconds();
</ins><span class="cx">     m_waitToDumpWatchdogTimer = adoptCF(CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + interval, 0, 0, 0, WTR::waitUntilDoneWatchdogTimerFired, NULL));
</span><span class="cx">     CFRunLoopAddTimer(CFRunLoopGetCurrent(), m_waitToDumpWatchdogTimer.get(), kCFRunLoopCommonModes);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlewpeTestRunnerWPEcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp        2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp   2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
</span><span class="cx"> {
</span><span class="cx">     if (!m_waitToDumpWatchdogTimer.isActive())
</span><del>-        m_waitToDumpWatchdogTimer.startOneShot(1_ms * m_timeout);
</del><ins>+        m_waitToDumpWatchdogTimer.startOneShot(m_timeout);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void TestRunner::installFakeHelvetica(JSStringRef configuration)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp  2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp     2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -94,10 +94,9 @@
</span><span class="cx"> const unsigned TestController::w3cSVGViewWidth = 480;
</span><span class="cx"> const unsigned TestController::w3cSVGViewHeight = 360;
</span><span class="cx"> 
</span><del>-const double TestController::defaultShortTimeout = 5.0;
</del><ins>+const WTF::Seconds TestController::defaultShortTimeout = 5_s;
+const WTF::Seconds TestController::noTimeout = -1_s;
</ins><span class="cx"> 
</span><del>-const double TestController::noTimeout = -1;
-
</del><span class="cx"> static WKURLRef blankURL()
</span><span class="cx"> {
</span><span class="cx">     static WKURLRef staticBlankURL = WKURLCreateWithUTF8CString("about:blank");
</span><span class="lines">@@ -129,7 +128,7 @@
</span><span class="cx">     initialize(argc, argv);
</span><span class="cx">     controller = this;
</span><span class="cx">     run();
</span><del>-    controller = 0;
</del><ins>+    controller = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TestController::~TestController()
</span><span class="lines">@@ -1252,7 +1251,7 @@
</span><span class="cx">         arg = tokenizer.next();
</span><span class="cx">         if (arg == std::string("--timeout")) {
</span><span class="cx">             std::string timeoutToken = tokenizer.next();
</span><del>-            result.timeout = atoi(timeoutToken.c_str());
</del><ins>+            result.timeout = Seconds::fromMilliseconds(atoi(timeoutToken.c_str()));
</ins><span class="cx">         } else if (arg == std::string("-p") || arg == std::string("--pixel-test")) {
</span><span class="cx">             result.shouldDumpPixels = true;
</span><span class="cx">             if (tokenizer.hasNext())
</span><span class="lines">@@ -1283,8 +1282,10 @@
</span><span class="cx"> 
</span><span class="cx">     if (command.shouldDumpPixels || m_shouldDumpPixelsForAllTests)
</span><span class="cx">         m_currentInvocation->setIsPixelTest(command.expectedPixelHash);
</span><del>-    if (command.timeout > 0)
</del><ins>+
+    if (command.timeout > 0_s)
</ins><span class="cx">         m_currentInvocation->setCustomTimeout(command.timeout);
</span><ins>+
</ins><span class="cx">     m_currentInvocation->setDumpJSConsoleLogInStdErr(command.dumpJSConsoleLogInStdErr || options.dumpJSConsoleLogInStdErr);
</span><span class="cx"> 
</span><span class="cx">     platformWillRunTest(*m_currentInvocation);
</span><span class="lines">@@ -1323,7 +1324,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TestController::runUntil(bool& done, double timeout)
</del><ins>+void TestController::runUntil(bool& done, WTF::Seconds timeout)
</ins><span class="cx"> {
</span><span class="cx">     if (m_forceNoTimeout)
</span><span class="cx">         timeout = noTimeout;
</span><span class="lines">@@ -1414,7 +1415,6 @@
</span><span class="cx"> 
</span><span class="cx">         if (WKStringIsEqualToUTF8CString(subMessageName, "KeyDown")) {
</span><span class="cx">             didReceiveKeyDownMessageFromInjectedBundle(messageBodyDictionary, false);
</span><del>-
</del><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.h (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.h    2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/TestController.h       2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx">  * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-#ifndef TestController_h
-#define TestController_h
</del><ins>+#pragma once
</ins><span class="cx"> 
</span><span class="cx"> #include "GeolocationProviderMock.h"
</span><span class="cx"> #include "WebNotificationProvider.h"
</span><span class="lines">@@ -34,6 +33,7 @@
</span><span class="cx"> #include <string>
</span><span class="cx"> #include <vector>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><ins>+#include <wtf/Seconds.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> 
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx">     static const unsigned w3cSVGViewWidth;
</span><span class="cx">     static const unsigned w3cSVGViewHeight;
</span><span class="cx"> 
</span><del>-    static const double defaultShortTimeout;
-    static const double noTimeout;
</del><ins>+    static const WTF::Seconds defaultShortTimeout;
+    static const WTF::Seconds noTimeout;
</ins><span class="cx"> 
</span><span class="cx">     TestController(int argc, const char* argv[]);
</span><span class="cx">     ~TestController();
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">     
</span><span class="cx">     // Runs the run loop until `done` is true or the timeout elapses.
</span><span class="cx">     bool useWaitToDumpWatchdogTimer() { return m_useWaitToDumpWatchdogTimer; }
</span><del>-    void runUntil(bool& done, double timeoutSeconds);
</del><ins>+    void runUntil(bool& done, WTF::Seconds timeout);
</ins><span class="cx">     void notifyDone();
</span><span class="cx"> 
</span><span class="cx">     bool shouldShowWebView() const { return m_shouldShowWebView; }
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> #endif
</span><span class="cx">     void platformConfigureViewForTest(const TestInvocation&);
</span><span class="cx">     void platformWillRunTest(const TestInvocation&);
</span><del>-    void platformRunUntil(bool& done, double timeout);
</del><ins>+    void platformRunUntil(bool& done, WTF::Seconds timeout);
</ins><span class="cx">     void platformDidCommitLoadForFrame(WKPageRef, WKFrameRef);
</span><span class="cx">     WKContextRef platformContext();
</span><span class="cx">     WKPreferencesRef platformPreferences();
</span><span class="lines">@@ -291,7 +291,6 @@
</span><span class="cx">     static void didFinishNavigation(WKPageRef, WKNavigationRef, WKTypeRef userData, const void*);
</span><span class="cx">     void didFinishNavigation(WKPageRef, WKNavigationRef);
</span><span class="cx"> 
</span><del>-    
</del><span class="cx">     // WKContextDownloadClient
</span><span class="cx">     static void downloadDidStart(WKContextRef, WKDownloadRef, const void*);
</span><span class="cx">     void downloadDidStart(WKContextRef, WKDownloadRef);
</span><span class="lines">@@ -450,12 +449,10 @@
</span><span class="cx"> struct TestCommand {
</span><span class="cx">     std::string pathOrURL;
</span><span class="cx">     std::string absolutePath;
</span><ins>+    std::string expectedPixelHash;
+    WTF::Seconds timeout;
</ins><span class="cx">     bool shouldDumpPixels { false };
</span><del>-    std::string expectedPixelHash;
-    int timeout { 0 };
</del><span class="cx">     bool dumpJSConsoleLogInStdErr { false };
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WTR
</span><del>-
-#endif // TestController_h
</del></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp  2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp     2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">     m_expectedPixelHash = expectedPixelHash;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-double TestInvocation::shortTimeout() const
</del><ins>+WTF::Seconds TestInvocation::shortTimeout() const
</ins><span class="cx"> {
</span><span class="cx">     if (!m_timeout) {
</span><span class="cx">         // Running WKTR directly, without webkitpy.
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx">     // but it currently does. There is no way to know what a normal test's timeout is, as webkitpy only passes timeouts
</span><span class="cx">     // for each test individually.
</span><span class="cx">     // But there shouldn't be any observable negative consequences from this.
</span><del>-    return m_timeout / 1000. / 4;
</del><ins>+    return m_timeout / 4;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool TestInvocation::shouldLogHistoryClientCallbacks() const
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx">     WKDictionarySetItem(beginTestMessageBody.get(), useWaitToDumpWatchdogTimerKey.get(), useWaitToDumpWatchdogTimerValue.get());
</span><span class="cx"> 
</span><span class="cx">     WKRetainPtr<WKStringRef> timeoutKey = adoptWK(WKStringCreateWithUTF8CString("Timeout"));
</span><del>-    WKRetainPtr<WKUInt64Ref> timeoutValue = adoptWK(WKUInt64Create(m_timeout));
</del><ins>+    WKRetainPtr<WKUInt64Ref> timeoutValue = adoptWK(WKUInt64Create(m_timeout.milliseconds()));
</ins><span class="cx">     WKDictionarySetItem(beginTestMessageBody.get(), timeoutKey.get(), timeoutValue.get());
</span><span class="cx"> 
</span><span class="cx">     WKRetainPtr<WKStringRef> dumpJSConsoleLogInStdErrKey = adoptWK(WKStringCreateWithUTF8CString("DumpJSConsoleLogInStdErr"));
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestInvocationh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestInvocation.h (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestInvocation.h    2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.h       2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include <WebKit/WKRetainPtr.h>
</span><span class="cx"> #include <string>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><ins>+#include <wtf/Seconds.h>
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> 
</span><span class="cx"> namespace WTR {
</span><span class="lines">@@ -50,12 +51,10 @@
</span><span class="cx"> 
</span><span class="cx">     void setIsPixelTest(const std::string& expectedPixelHash);
</span><span class="cx"> 
</span><del>-    // Milliseconds
-    void setCustomTimeout(int duration) { m_timeout = duration; }
</del><ins>+    void setCustomTimeout(WTF::Seconds duration) { m_timeout = duration; }
</ins><span class="cx">     void setDumpJSConsoleLogInStdErr(bool value) { m_dumpJSConsoleLogInStdErr = value; }
</span><span class="cx"> 
</span><del>-    // Seconds
-    double shortTimeout() const;
</del><ins>+    WTF::Seconds shortTimeout() const;
</ins><span class="cx"> 
</span><span class="cx">     void invoke();
</span><span class="cx">     void didReceiveMessageFromInjectedBundle(WKStringRef messageName, WKTypeRef messageBody);
</span><span class="lines">@@ -116,7 +115,7 @@
</span><span class="cx"> 
</span><span class="cx">     std::string m_expectedPixelHash;
</span><span class="cx"> 
</span><del>-    int m_timeout { 0 };
</del><ins>+    WTF::Seconds m_timeout;
</ins><span class="cx">     bool m_dumpJSConsoleLogInStdErr { false };
</span><span class="cx"> 
</span><span class="cx">     // Invocation state
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestOptions.h (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestOptions.h       2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/TestOptions.h  2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx">  * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-#ifndef TestOptions_h
-#define TestOptions_h
</del><ins>+#pragma once
</ins><span class="cx"> 
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -111,5 +110,3 @@
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span><del>-
-#endif // TestOptions_h
</del></span></pre></div>
<a id="trunkToolsWebKitTestRunnercocoaTestControllerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm        2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm   2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -196,9 +196,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TestController::platformRunUntil(bool& done, double timeout)
</del><ins>+void TestController::platformRunUntil(bool& done, WTF::Seconds timeout)
</ins><span class="cx"> {
</span><del>-    NSDate *endDate = (timeout > 0) ? [NSDate dateWithTimeIntervalSinceNow:timeout] : [NSDate distantFuture];
</del><ins>+    NSDate *endDate = (timeout > 0_s) ? [NSDate dateWithTimeIntervalSinceNow:timeout.seconds()] : [NSDate distantFuture];
</ins><span class="cx"> 
</span><span class="cx">     while (!done && [endDate compare:[NSDate date]] == NSOrderedDescending)
</span><span class="cx">         [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:endDate];
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnergtkTestControllerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp   2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp      2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -74,13 +74,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TestController::platformRunUntil(bool&, double timeout)
</del><ins>+void TestController::platformRunUntil(bool&, WTF::Seconds timeout)
</ins><span class="cx"> {
</span><del>-    if (timeout > 0) {
</del><ins>+    if (timeout > 0_s) {
</ins><span class="cx">         // FIXME: This conversion is now repeated in several places, it should be moved to a common place in WTF and used everywhere.
</span><del>-        auto timeoutDuration = Seconds { timeout };
</del><span class="cx">         gint64 currentTime = g_get_monotonic_time();
</span><del>-        gint64 targetTime = currentTime + std::min<gint64>(G_MAXINT64 - currentTime, timeoutDuration.microsecondsAs<int64_t>());
</del><ins>+        gint64 targetTime = currentTime + std::min<gint64>(G_MAXINT64 - currentTime, timeout.microsecondsAs<int64_t>());
</ins><span class="cx">         ASSERT(targetTime >= currentTime);
</span><span class="cx">         g_source_set_ready_time(timeoutSource(), targetTime);
</span><span class="cx">     } else
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerwpeTestControllerWPEcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp (235398 => 235399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp   2018-08-27 21:00:25 UTC (rev 235398)
+++ trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp      2018-08-27 21:11:22 UTC (rev 235399)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TestController::platformRunUntil(bool& condition, double timeout)
</del><ins>+void TestController::platformRunUntil(bool& condition, WTF::Seconds timeout)
</ins><span class="cx"> {
</span><span class="cx">     struct TimeoutTimer {
</span><span class="cx">         TimeoutTimer()
</span><span class="lines">@@ -70,8 +70,8 @@
</span><span class="cx">     } timeoutTimer;
</span><span class="cx"> 
</span><span class="cx">     timeoutTimer.timer.setPriority(G_PRIORITY_DEFAULT_IDLE);
</span><del>-    if (timeout >= 0)
-        timeoutTimer.timer.startOneShot(Seconds(timeout));
</del><ins>+    if (timeout >= 0_s)
+        timeoutTimer.timer.startOneShot(timeout);
</ins><span class="cx"> 
</span><span class="cx">     RunLoop::main().run();
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>