<!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>[191852] 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/191852">191852</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-01 00:54:38 -0700 (Sun, 01 Nov 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Use RunLoop::Timer in main thread shared timer GTK+ implementation
https://bugs.webkit.org/show_bug.cgi?id=150754

Reviewed by Darin Adler.

Source/WebCore:

It's more efficient because it uses a persistent source and it
simplifies the code even more.

* platform/MainThreadSharedTimer.cpp:
(WebCore::MainThreadSharedTimer::fired): Make it non-const to be
able to use it as function callback of a RunLoop::Timer.
* platform/MainThreadSharedTimer.h:
* platform/gtk/MainThreadSharedTimerGtk.cpp:
(WebCore::MainThreadSharedTimer::MainThreadSharedTimer):
Initialize the RunLoop::Timer and set the prioriry.
(WebCore::MainThreadSharedTimer::setFireInterval):
(WebCore::MainThreadSharedTimer::stop):

Source/WTF:

Add API to set the priority of a RunLoop::Timer for GLib.

* wtf/RunLoop.h:
* wtf/glib/RunLoopGLib.cpp:
(WTF::RunLoop::TimerBase::setPriority):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfRunLooph">trunk/Source/WTF/wtf/RunLoop.h</a></li>
<li><a href="#trunkSourceWTFwtfglibRunLoopGLibcpp">trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformMainThreadSharedTimercpp">trunk/Source/WebCore/platform/MainThreadSharedTimer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformMainThreadSharedTimerh">trunk/Source/WebCore/platform/MainThreadSharedTimer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkMainThreadSharedTimerGtkcpp">trunk/Source/WebCore/platform/gtk/MainThreadSharedTimerGtk.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (191851 => 191852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2015-11-01 05:47:41 UTC (rev 191851)
+++ trunk/Source/WTF/ChangeLog        2015-11-01 07:54:38 UTC (rev 191852)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-11-01  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
+        [GTK] Use RunLoop::Timer in main thread shared timer GTK+ implementation
+        https://bugs.webkit.org/show_bug.cgi?id=150754
+
+        Reviewed by Darin Adler.
+
+        Add API to set the priority of a RunLoop::Timer for GLib.
+
+        * wtf/RunLoop.h:
+        * wtf/glib/RunLoopGLib.cpp:
+        (WTF::RunLoop::TimerBase::setPriority):
+
</ins><span class="cx"> 2015-10-31  Andreas Kling  &lt;akling@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add a debug overlay with information about web process resource usage.
</span></span></pre></div>
<a id="trunkSourceWTFwtfRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RunLoop.h (191851 => 191852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoop.h        2015-11-01 05:47:41 UTC (rev 191851)
+++ trunk/Source/WTF/wtf/RunLoop.h        2015-11-01 07:54:38 UTC (rev 191852)
</span><span class="lines">@@ -83,6 +83,10 @@
</span><span class="cx"> 
</span><span class="cx">         virtual void fired() = 0;
</span><span class="cx"> 
</span><ins>+#if USE(GLIB) &amp;&amp; !PLATFORM(EFL)
+        void setPriority(int);
+#endif
+
</ins><span class="cx">     private:
</span><span class="cx">         WTF_EXPORT_PRIVATE void start(double nextFireInterval, bool repeat);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWTFwtfglibRunLoopGLibcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp (191851 => 191852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp        2015-11-01 05:47:41 UTC (rev 191851)
+++ trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp        2015-11-01 07:54:38 UTC (rev 191852)
</span><span class="lines">@@ -141,6 +141,11 @@
</span><span class="cx">     g_source_destroy(m_source.get());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void RunLoop::TimerBase::setPriority(int priority)
+{
+    g_source_set_priority(m_source.get(), priority);
+}
+
</ins><span class="cx"> void RunLoop::TimerBase::updateReadyTime()
</span><span class="cx"> {
</span><span class="cx">     g_source_set_ready_time(m_source.get(), m_fireInterval.count() ? g_get_monotonic_time() + m_fireInterval.count() : 0);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191851 => 191852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-11-01 05:47:41 UTC (rev 191851)
+++ trunk/Source/WebCore/ChangeLog        2015-11-01 07:54:38 UTC (rev 191852)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-11-01  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
+
+        [GTK] Use RunLoop::Timer in main thread shared timer GTK+ implementation
+        https://bugs.webkit.org/show_bug.cgi?id=150754
+
+        Reviewed by Darin Adler.
+
+        It's more efficient because it uses a persistent source and it
+        simplifies the code even more.
+
+        * platform/MainThreadSharedTimer.cpp:
+        (WebCore::MainThreadSharedTimer::fired): Make it non-const to be
+        able to use it as function callback of a RunLoop::Timer.
+        * platform/MainThreadSharedTimer.h:
+        * platform/gtk/MainThreadSharedTimerGtk.cpp:
+        (WebCore::MainThreadSharedTimer::MainThreadSharedTimer):
+        Initialize the RunLoop::Timer and set the prioriry.
+        (WebCore::MainThreadSharedTimer::setFireInterval):
+        (WebCore::MainThreadSharedTimer::stop):
+
</ins><span class="cx"> 2015-10-31  Andreas Kling  &lt;akling@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add a debug overlay with information about web process resource usage.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMainThreadSharedTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MainThreadSharedTimer.cpp (191851 => 191852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MainThreadSharedTimer.cpp        2015-11-01 05:47:41 UTC (rev 191851)
+++ trunk/Source/WebCore/platform/MainThreadSharedTimer.cpp        2015-11-01 07:54:38 UTC (rev 191852)
</span><span class="lines">@@ -34,9 +34,11 @@
</span><span class="cx">     return instance;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if !PLATFORM(GTK)
</ins><span class="cx"> MainThreadSharedTimer::MainThreadSharedTimer()
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> void MainThreadSharedTimer::setFiredFunction(std::function&lt;void()&gt;&amp;&amp; firedFunction)
</span><span class="cx"> {
</span><span class="lines">@@ -44,7 +46,7 @@
</span><span class="cx">     m_firedFunction = WTF::move(firedFunction);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MainThreadSharedTimer::fired() const
</del><ins>+void MainThreadSharedTimer::fired()
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_firedFunction);
</span><span class="cx">     m_firedFunction();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMainThreadSharedTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MainThreadSharedTimer.h (191851 => 191852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MainThreadSharedTimer.h        2015-11-01 05:47:41 UTC (rev 191851)
+++ trunk/Source/WebCore/platform/MainThreadSharedTimer.h        2015-11-01 07:54:38 UTC (rev 191852)
</span><span class="lines">@@ -30,6 +30,10 @@
</span><span class="cx"> #include &quot;SharedTimer.h&quot;
</span><span class="cx"> #include &lt;wtf/NeverDestroyed.h&gt;
</span><span class="cx"> 
</span><ins>+#if PLATFORM(GTK)
+#include &lt;wtf/RunLoop.h&gt;
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class MainThreadSharedTimer final : public SharedTimer {
</span><span class="lines">@@ -44,12 +48,15 @@
</span><span class="cx"> 
</span><span class="cx">     // FIXME: This should be private, but CF and Windows implementations
</span><span class="cx">     // need to call this from non-member functions at the moment.
</span><del>-    void fired() const;
</del><ins>+    void fired();
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     MainThreadSharedTimer();
</span><span class="cx"> 
</span><span class="cx">     std::function&lt;void()&gt; m_firedFunction;
</span><ins>+#if PLATFORM(GTK)
+    RunLoop::Timer&lt;MainThreadSharedTimer&gt; m_timer;
+#endif
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkMainThreadSharedTimerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/MainThreadSharedTimerGtk.cpp (191851 => 191852)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/MainThreadSharedTimerGtk.cpp        2015-11-01 05:47:41 UTC (rev 191851)
+++ trunk/Source/WebCore/platform/gtk/MainThreadSharedTimerGtk.cpp        2015-11-01 07:54:38 UTC (rev 191852)
</span><span class="lines">@@ -28,25 +28,26 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;MainThreadSharedTimer.h&quot;
</span><span class="cx"> 
</span><del>-#include &lt;wtf/glib/GMainLoopSource.h&gt;
</del><ins>+#include &lt;glib.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-static GMainLoopSource gSharedTimer;
</del><ins>+MainThreadSharedTimer::MainThreadSharedTimer()
+    : m_timer(RunLoop::main(), this, &amp;MainThreadSharedTimer::fired)
+{
+    // This is GDK_PRIORITY_REDRAW, but we don't want to depend on GDK here just to use a constant.
+    m_timer.setPriority(G_PRIORITY_HIGH_IDLE + 20);
+}
</ins><span class="cx"> 
</span><span class="cx"> void MainThreadSharedTimer::setFireInterval(double interval)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_firedFunction);
</span><del>-
-    // This is GDK_PRIORITY_REDRAW, but we don't want to depend on GDK here just to use a constant.
-    static const int priority = G_PRIORITY_HIGH_IDLE + 20;
-    gSharedTimer.scheduleAfterDelay(&quot;[WebKit] sharedTimerTimeoutCallback&quot;, [this] { fired(); },
-        std::chrono::duration_cast&lt;std::chrono::microseconds&gt;(std::chrono::duration&lt;double&gt;(interval)), priority);
</del><ins>+    m_timer.startOneShot(interval);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MainThreadSharedTimer::stop()
</span><span class="cx"> {
</span><del>-    gSharedTimer.cancel();
</del><ins>+    m_timer.stop();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MainThreadSharedTimer::invalidate()
</span></span></pre>
</div>
</div>

</body>
</html>