<!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>[174818] trunk/Source</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/174818">174818</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-17 03:10:47 -0700 (Fri, 17 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GLIB] Add API to GMainLoopSource to schedule sources after a delay in microseconds
https://bugs.webkit.org/show_bug.cgi?id=137782
Reviewed by Sergio Villar Senin.
Source/WebCore:
* platform/gtk/SharedTimerGtk.cpp:
(WebCore::setSharedTimerFireInterval): Use microseconds instead of
milliseconds.
Source/WebKit2:
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::layerFlushTimerFired): Use microseconds
instead of milliseconds.
Source/WTF:
In some cases when we have a double with the time in seconds, the
conversion to milliseconds ends up truncating the value to 0, and
the source scheduled immediately.
* wtf/gobject/GMainLoopSource.cpp:
(WTF::createMicrosecondsTimeoutSource): Use a custom timeout
source that handles the interval in microseconds instead of milliseconds.
(WTF::GMainLoopSource::scheduleAfterDelay): Use MicrosecondsTimeoutSource.
(WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy): Ditto.
* wtf/gobject/GMainLoopSource.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfgobjectGMainLoopSourcecpp">trunk/Source/WTF/wtf/gobject/GMainLoopSource.cpp</a></li>
<li><a href="#trunkSourceWTFwtfgobjectGMainLoopSourceh">trunk/Source/WTF/wtf/gobject/GMainLoopSource.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkSharedTimerGtkcpp">trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (174817 => 174818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-10-17 10:04:37 UTC (rev 174817)
+++ trunk/Source/WTF/ChangeLog 2014-10-17 10:10:47 UTC (rev 174818)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-10-17 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GLIB] Add API to GMainLoopSource to schedule sources after a delay in microseconds
+ https://bugs.webkit.org/show_bug.cgi?id=137782
+
+ Reviewed by Sergio Villar Senin.
+
+ In some cases when we have a double with the time in seconds, the
+ conversion to milliseconds ends up truncating the value to 0, and
+ the source scheduled immediately.
+
+ * wtf/gobject/GMainLoopSource.cpp:
+ (WTF::createMicrosecondsTimeoutSource): Use a custom timeout
+ source that handles the interval in microseconds instead of milliseconds.
+ (WTF::GMainLoopSource::scheduleAfterDelay): Use MicrosecondsTimeoutSource.
+ (WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy): Ditto.
+ * wtf/gobject/GMainLoopSource.h:
+
</ins><span class="cx"> 2014-10-17 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Reverted incorrect build fix attempt.
</span></span></pre></div>
<a id="trunkSourceWTFwtfgobjectGMainLoopSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/gobject/GMainLoopSource.cpp (174817 => 174818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/gobject/GMainLoopSource.cpp 2014-10-17 10:04:37 UTC (rev 174817)
+++ trunk/Source/WTF/wtf/gobject/GMainLoopSource.cpp 2014-10-17 10:10:47 UTC (rev 174818)
</span><span class="lines">@@ -233,6 +233,69 @@
</span><span class="cx"> scheduleTimeoutSource(name, reinterpret_cast<GSourceFunc>(boolSourceCallback), priority, context);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+struct MicrosecondsTimeoutSource {
+ GSource source;
+ uint64_t delay;
+};
+
+static GSourceFuncs microsecondsTimeoutSourceFunctions = {
+ nullptr, // prepare
+ nullptr, // check
+ // dispatch
+ [](GSource* source, GSourceFunc callback, gpointer userData) -> gboolean
+ {
+ bool repeat = callback(userData);
+ if (repeat)
+ g_source_set_ready_time(source, g_source_get_time(source) + reinterpret_cast<MicrosecondsTimeoutSource*>(source)->delay);
+ return repeat;
+ },
+ nullptr, // finalize
+ nullptr, // closure_callback
+ nullptr // closure_marshall
+};
+
+static GSource* createMicrosecondsTimeoutSource(uint64_t delay)
+{
+ GSource* source = g_source_new(&microsecondsTimeoutSourceFunctions, sizeof(MicrosecondsTimeoutSource));
+ reinterpret_cast<MicrosecondsTimeoutSource*>(source)->delay = delay;
+ g_source_set_ready_time(source, g_get_monotonic_time() + delay);
+ return source;
+}
+
+void GMainLoopSource::scheduleAfterDelay(const char* name, std::function<void ()> function, std::chrono::microseconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ cancel();
+
+ ASSERT(!m_context.source);
+ m_context = {
+ adoptGRef(createMicrosecondsTimeoutSource(delay.count())),
+ nullptr, // cancellable
+ nullptr, // socketCancellable
+ WTF::move(function),
+ nullptr, // boolCallback
+ nullptr, // socketCallback
+ WTF::move(destroyFunction)
+ };
+ scheduleTimeoutSource(name, reinterpret_cast<GSourceFunc>(voidSourceCallback), priority, context);
+}
+
+void GMainLoopSource::scheduleAfterDelay(const char* name, std::function<bool ()> function, std::chrono::microseconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ cancel();
+
+ ASSERT(!m_context.source);
+ m_context = {
+ adoptGRef(createMicrosecondsTimeoutSource(delay.count())),
+ nullptr, // cancellable
+ nullptr, // socketCancellable
+ nullptr, // voidCallback
+ WTF::move(function),
+ nullptr, // socketCallback
+ WTF::move(destroyFunction)
+ };
+ scheduleTimeoutSource(name, reinterpret_cast<GSourceFunc>(boolSourceCallback), priority, context);
+}
+
</ins><span class="cx"> void GMainLoopSource::scheduleAndDeleteOnDestroy(const char* name, std::function<void()> function, int priority, std::function<void()> destroyFunction, GMainContext* context)
</span><span class="cx"> {
</span><span class="cx"> create().schedule(name, function, priority, destroyFunction, context);
</span><span class="lines">@@ -263,6 +326,16 @@
</span><span class="cx"> create().scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<void()> function, std::chrono::microseconds delay, int priority, std::function<void()> destroyFunction, GMainContext* context)
+{
+ create().scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+}
+
+void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<bool()> function, std::chrono::microseconds delay, int priority, std::function<void()> destroyFunction, GMainContext* context)
+{
+ create().scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+}
+
</ins><span class="cx"> bool GMainLoopSource::prepareVoidCallback(Context& context)
</span><span class="cx"> {
</span><span class="cx"> if (!m_context.source)
</span></span></pre></div>
<a id="trunkSourceWTFwtfgobjectGMainLoopSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/gobject/GMainLoopSource.h (174817 => 174818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/gobject/GMainLoopSource.h 2014-10-17 10:04:37 UTC (rev 174817)
+++ trunk/Source/WTF/wtf/gobject/GMainLoopSource.h 2014-10-17 10:10:47 UTC (rev 174818)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<bool()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
</span><span class="cx"> WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<void()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
</span><span class="cx"> WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<bool()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
</span><ins>+ WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<void()>, std::chrono::microseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<bool()>, std::chrono::microseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
</ins><span class="cx"> WTF_EXPORT_PRIVATE virtual void cancel();
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE void schedule(const char* name, std::function<bool(GIOCondition)>, GSocket*, GIOCondition, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
</span><span class="lines">@@ -66,6 +68,8 @@
</span><span class="cx"> static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<bool()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
</span><span class="cx"> static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<void()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
</span><span class="cx"> static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<bool()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
</span><ins>+ static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<void()>, std::chrono::microseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<bool()>, std::chrono::microseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> enum Status { Ready, Scheduled, Dispatching };
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174817 => 174818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-17 10:04:37 UTC (rev 174817)
+++ trunk/Source/WebCore/ChangeLog 2014-10-17 10:10:47 UTC (rev 174818)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-10-17 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GLIB] Add API to GMainLoopSource to schedule sources after a delay in microseconds
+ https://bugs.webkit.org/show_bug.cgi?id=137782
+
+ Reviewed by Sergio Villar Senin.
+
+ * platform/gtk/SharedTimerGtk.cpp:
+ (WebCore::setSharedTimerFireInterval): Use microseconds instead of
+ milliseconds.
+
+2014-10-17 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Move touch events handling from Platform to WebKit2
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137735
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkSharedTimerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp (174817 => 174818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp 2014-10-17 10:04:37 UTC (rev 174817)
+++ trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp 2014-10-17 10:10:47 UTC (rev 174818)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> ASSERT(sharedTimerFiredFunction);
</span><span class="cx">
</span><span class="cx"> gSharedTimer.scheduleAfterDelay("[WebKit] sharedTimerTimeoutCallback", std::function<void()>(sharedTimerFiredFunction),
</span><del>- std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::duration<double>(interval)), GDK_PRIORITY_REDRAW);
</del><ins>+ std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::duration<double>(interval)), GDK_PRIORITY_REDRAW);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void stopSharedTimer()
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (174817 => 174818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-10-17 10:04:37 UTC (rev 174817)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-17 10:10:47 UTC (rev 174818)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-10-17 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GLIB] Add API to GMainLoopSource to schedule sources after a delay in microseconds
+ https://bugs.webkit.org/show_bug.cgi?id=137782
+
+ Reviewed by Sergio Villar Senin.
+
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+ (WebKit::LayerTreeHostGtk::layerFlushTimerFired): Use microseconds
+ instead of milliseconds.
+
+2014-10-17 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Move touch events handling from Platform to WebKit2
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137735
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (174817 => 174818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2014-10-17 10:04:37 UTC (rev 174817)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2014-10-17 10:10:47 UTC (rev 174818)
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> const double targetFPS = 60;
</span><span class="cx"> double nextFlush = std::max((1 / targetFPS) - (currentTime() - m_lastFlushTime), 0.0);
</span><span class="cx"> m_layerFlushTimerCallback.scheduleAfterDelay("[WebKit] layerFlushTimer", std::bind(&LayerTreeHostGtk::layerFlushTimerFired, this),
</span><del>- std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::duration<double>(nextFlush)), GDK_PRIORITY_EVENTS);
</del><ins>+ std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::duration<double>(nextFlush)), GDK_PRIORITY_EVENTS);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>