Unreviewed, attempt to fix WPE build
authorutatane.tea@gmail.com <utatane.tea@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 Mar 2018 12:21:52 +0000 (12:21 +0000)
committerutatane.tea@gmail.com <utatane.tea@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 5 Mar 2018 12:21:52 +0000 (12:21 +0000)
* WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp:
(WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
* WebKitTestRunner/wpe/PlatformWebViewWPE.cpp:
(WTR::PlatformWebView::windowSnapshotImage):
* WebKitTestRunner/wpe/TestControllerWPE.cpp:
(WTR::TestController::platformRunUntil):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229256 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp
Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp
Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp

index d7fdd70..6d2bfd8 100644 (file)
@@ -1,3 +1,14 @@
+2018-03-05  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Unreviewed, attempt to fix WPE build
+
+        * WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp:
+        (WTR::TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded):
+        * WebKitTestRunner/wpe/PlatformWebViewWPE.cpp:
+        (WTR::PlatformWebView::windowSnapshotImage):
+        * WebKitTestRunner/wpe/TestControllerWPE.cpp:
+        (WTR::TestController::platformRunUntil):
+
 2018-03-04  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [WTF] Move currentCPUTime and sleep(Seconds) to CPUTime.h and Seconds.h respectively
index d97cc66..27abc2a 100644 (file)
@@ -52,7 +52,7 @@ void TestRunner::platformInitialize()
 void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
 {
     if (!m_waitToDumpWatchdogTimer.isActive())
-        m_waitToDumpWatchdogTimer.startOneShot(m_timeout / 1000.0);
+        m_waitToDumpWatchdogTimer.startOneShot(1_ms * m_timeout);
 }
 
 void TestRunner::installFakeHelvetica(JSStringRef configuration)
index b178bed..fe582c7 100644 (file)
@@ -106,7 +106,7 @@ cairo_surface_t* PlatformWebView::windowSnapshotImage()
             TimeoutTimer()
                 : timer(RunLoop::main(), this, &TimeoutTimer::fired)
             {
-                timer.startOneShot(1.0 / 60);
+                timer.startOneShot(1_s / 60);
             }
 
             void fired() { RunLoop::main().stop(); }
index 82a8389..b7b1e4d 100644 (file)
@@ -71,7 +71,7 @@ void TestController::platformRunUntil(bool& condition, double timeout)
 
     timeoutTimer.timer.setPriority(G_PRIORITY_DEFAULT_IDLE);
     if (timeout >= 0)
-        timeoutTimer.timer.startOneShot(timeout);
+        timeoutTimer.timer.startOneShot(Seconds(timeout));
 
     RunLoop::main().run();