Title: [229256] trunk/Tools
- Revision
- 229256
- Author
- [email protected]
- Date
- 2018-03-05 04:21:52 -0800 (Mon, 05 Mar 2018)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (229255 => 229256)
--- trunk/Tools/ChangeLog 2018-03-05 11:55:45 UTC (rev 229255)
+++ trunk/Tools/ChangeLog 2018-03-05 12:21:52 UTC (rev 229256)
@@ -1,3 +1,14 @@
+2018-03-05 Yusuke Suzuki <[email protected]>
+
+ 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 <[email protected]>
[WTF] Move currentCPUTime and sleep(Seconds) to CPUTime.h and Seconds.h respectively
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp (229255 => 229256)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp 2018-03-05 11:55:45 UTC (rev 229255)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/wpe/TestRunnerWPE.cpp 2018-03-05 12:21:52 UTC (rev 229256)
@@ -52,7 +52,7 @@
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)
Modified: trunk/Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp (229255 => 229256)
--- trunk/Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp 2018-03-05 11:55:45 UTC (rev 229255)
+++ trunk/Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp 2018-03-05 12:21:52 UTC (rev 229256)
@@ -106,7 +106,7 @@
TimeoutTimer()
: timer(RunLoop::main(), this, &TimeoutTimer::fired)
{
- timer.startOneShot(1.0 / 60);
+ timer.startOneShot(1_s / 60);
}
void fired() { RunLoop::main().stop(); }
Modified: trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp (229255 => 229256)
--- trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp 2018-03-05 11:55:45 UTC (rev 229255)
+++ trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp 2018-03-05 12:21:52 UTC (rev 229256)
@@ -71,7 +71,7 @@
timeoutTimer.timer.setPriority(G_PRIORITY_DEFAULT_IDLE);
if (timeout >= 0)
- timeoutTimer.timer.startOneShot(timeout);
+ timeoutTimer.timer.startOneShot(Seconds(timeout));
RunLoop::main().run();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
