<!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>[176591] 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/176591">176591</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-01 06:48:34 -0800 (Mon, 01 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/176566">r176566</a>.
https://bugs.webkit.org/show_bug.cgi?id=139124
It broke the GTK performance tests. (Requested by clopez on
#webkit).
Reverted changeset:
"[GTK] Use GMainLoopSource in WebKitTestRunner"
https://bugs.webkit.org/show_bug.cgi?id=138831
http://trac.webkit.org/changeset/176566</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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="#trunkToolsWebKitTestRunnergtkTestControllerGtkcpp">trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (176590 => 176591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-12-01 07:36:45 UTC (rev 176590)
+++ trunk/Tools/ChangeLog        2014-12-01 14:48:34 UTC (rev 176591)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-12-01 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r176566.
+ https://bugs.webkit.org/show_bug.cgi?id=139124
+
+ It broke the GTK performance tests. (Requested by clopez on
+ #webkit).
+
+ Reverted changeset:
+
+ "[GTK] Use GMainLoopSource in WebKitTestRunner"
+ https://bugs.webkit.org/show_bug.cgi?id=138831
+ http://trac.webkit.org/changeset/176566
+
</ins><span class="cx"> 2014-11-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when calling WKPageClose on the originated page from within createNewPage callback
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (176590 => 176591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h        2014-12-01 07:36:45 UTC (rev 176590)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h        2014-12-01 14:48:34 UTC (rev 176591)
</span><span class="lines">@@ -38,8 +38,7 @@
</span><span class="cx"> #include <CoreFoundation/CFRunLoop.h>
</span><span class="cx"> typedef RetainPtr<CFRunLoopTimerRef> PlatformTimerRef;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
-typedef GMainLoopSource PlatformTimerRef;
</del><ins>+typedef unsigned int PlatformTimerRef;
</ins><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> typedef Ecore_Timer* PlatformTimerRef;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlegtkTestRunnerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp (176590 => 176591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp        2014-12-01 07:36:45 UTC (rev 176590)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp        2014-12-01 14:48:34 UTC (rev 176591)
</span><span class="lines">@@ -34,22 +34,33 @@
</span><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="cx">
</span><ins>+static gboolean waitToDumpWatchdogTimerCallback(gpointer)
+{
+ InjectedBundle::shared().testRunner()->waitToDumpWatchdogTimerFired();
+ return FALSE;
+}
+
</ins><span class="cx"> void TestRunner::platformInitialize()
</span><span class="cx"> {
</span><ins>+ m_waitToDumpWatchdogTimer = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::invalidateWaitToDumpWatchdogTimer()
</span><span class="cx"> {
</span><del>- m_waitToDumpWatchdogTimer.cancel();
</del><ins>+ if (!m_waitToDumpWatchdogTimer)
+ return;
+ g_source_remove(m_waitToDumpWatchdogTimer);
+ m_waitToDumpWatchdogTimer = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::initializeWaitToDumpWatchdogTimerIfNeeded()
</span><span class="cx"> {
</span><del>- if (m_waitToDumpWatchdogTimer.isScheduled())
</del><ins>+ if (m_waitToDumpWatchdogTimer)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_waitToDumpWatchdogTimer.scheduleAfterDelay("[WTR] waitToDumpWatchdogTimerCallback", [this] { waitToDumpWatchdogTimerFired(); },
- std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::duration<double>(waitToDumpWatchdogTimerInterval)));
</del><ins>+ m_waitToDumpWatchdogTimer = g_timeout_add(waitToDumpWatchdogTimerInterval * 1000,
+ waitToDumpWatchdogTimerCallback, 0);
+ g_source_set_name_by_id(m_waitToDumpWatchdogTimer, "[WebKit] waitToDumpWatchdogTimerCallback");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnergtkTestControllerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp (176590 => 176591)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp        2014-12-01 07:36:45 UTC (rev 176590)
+++ trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp        2014-12-01 14:48:34 UTC (rev 176591)
</span><span class="lines">@@ -29,18 +29,25 @@
</span><span class="cx">
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/Platform.h>
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="cx">
</span><del>-static GMainLoopSource timeoutSource;
</del><ins>+static guint gTimeoutSourceId = 0;
</ins><span class="cx">
</span><ins>+static void cancelTimeout()
+{
+ if (!gTimeoutSourceId)
+ return;
+ g_source_remove(gTimeoutSourceId);
+ gTimeoutSourceId = 0;
+}
+
</ins><span class="cx"> void TestController::notifyDone()
</span><span class="cx"> {
</span><span class="cx"> gtk_main_quit();
</span><del>- timeoutSource.cancel();
</del><ins>+ cancelTimeout();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::platformInitialize()
</span><span class="lines">@@ -51,16 +58,24 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static gboolean timeoutCallback(gpointer)
+{
+ fprintf(stderr, "FAIL: TestControllerRunLoop timed out.\n");
+ gtk_main_quit();
+ return FALSE;
+}
+
</ins><span class="cx"> void TestController::platformWillRunTest(const TestInvocation&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::platformRunUntil(bool&, double timeout)
</span><span class="cx"> {
</span><del>- timeoutSource.scheduleAfterDelay("[WTR] Test timeout source", [] {
- fprintf(stderr, "FAIL: TestControllerRunLoop timed out.\n");
- gtk_main_quit();
- }, std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::duration<double>(timeout)));
</del><ins>+ cancelTimeout();
+ if (timeout != m_noTimeout) {
+ gTimeoutSourceId = g_timeout_add(timeout * 1000, timeoutCallback, 0);
+ g_source_set_name_by_id(gTimeoutSourceId, "[WebKit] timeoutCallback");
+ }
</ins><span class="cx"> gtk_main();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>