<!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>[162307] trunk/Source/WebKit2</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/162307">162307</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-01-20 00:28:33 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed. Additional build fixes after <a href="http://trac.webkit.org/projects/webkit/changeset/162276">r162276</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/163304">r163304</a>.
* Platform/WorkQueue.h:
* Platform/gtk/WorkQueueGtk.cpp:
(WorkQueue::EventSource::EventSource):
(WorkQueue::dispatchOnSource):
(WorkQueue::dispatch):
(WorkQueue::dispatchAfter):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformWorkQueueh">trunk/Source/WebKit2/Platform/WorkQueue.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformgtkWorkQueueGtkcpp">trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162306 => 162307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-20 08:01:16 UTC (rev 162306)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-20 08:28:33 UTC (rev 162307)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-20 Zan Dobersek <zdobersek@igalia.com>
+
+ Unreviewed. Additional build fixes after r162276 and r163304.
+
+ * Platform/WorkQueue.h:
+ * Platform/gtk/WorkQueueGtk.cpp:
+ (WorkQueue::EventSource::EventSource):
+ (WorkQueue::dispatchOnSource):
+ (WorkQueue::dispatch):
+ (WorkQueue::dispatchAfter):
+
</ins><span class="cx"> 2014-01-19 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK build fix after r162276.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/WorkQueue.h (162306 => 162307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/WorkQueue.h 2014-01-20 08:01:16 UTC (rev 162306)
+++ trunk/Source/WebKit2/Platform/WorkQueue.h 2014-01-20 08:28:33 UTC (rev 162307)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> static void startWorkQueueThread(WorkQueue*);
</span><span class="cx"> void workQueueThreadBody();
</span><del>- void dispatchOnSource(GSource*, const std::function<void ()>&, GSourceFunc);
</del><ins>+ void dispatchOnSource(GSource*, std::function<void ()>, GSourceFunc);
</ins><span class="cx">
</span><span class="cx"> ThreadIdentifier m_workQueueThread;
</span><span class="cx"> GRefPtr<GMainContext> m_eventContext;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformgtkWorkQueueGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp (162306 => 162307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp 2014-01-20 08:01:16 UTC (rev 162306)
+++ trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp 2014-01-20 08:28:33 UTC (rev 162307)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> // WorkQueue::EventSource
</span><span class="cx"> class WorkQueue::EventSource {
</span><span class="cx"> public:
</span><del>- EventSource(const Function<void()>& function, WorkQueue* workQueue)
- : m_function(function)
</del><ins>+ EventSource(std::function<void()> function, WorkQueue* workQueue)
+ : m_function(std::move(function))
</ins><span class="cx"> , m_workQueue(workQueue)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(workQueue);
</span><span class="lines">@@ -204,23 +204,26 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatchOnSource(GSource* dispatchSource, const std::function<void ()>& function, GSourceFunc sourceCallback)
</del><ins>+void WorkQueue::dispatchOnSource(GSource* dispatchSource, std::function<void ()> function, GSourceFunc sourceCallback)
</ins><span class="cx"> {
</span><del>- g_source_set_callback(dispatchSource, sourceCallback, new EventSource(function, this),
</del><ins>+ g_source_set_callback(dispatchSource, sourceCallback, new EventSource(std::forward<std::function<void ()>>(function), this),
</ins><span class="cx"> reinterpret_cast<GDestroyNotify>(&WorkQueue::EventSource::deleteEventSource));
</span><span class="cx">
</span><span class="cx"> g_source_attach(dispatchSource, m_eventContext.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatch(const std::function<void ()>& function)
</del><ins>+void WorkQueue::dispatch(std::function<void ()> function)
</ins><span class="cx"> {
</span><span class="cx"> GRefPtr<GSource> dispatchSource = adoptGRef(g_idle_source_new());
</span><span class="cx"> g_source_set_priority(dispatchSource.get(), G_PRIORITY_DEFAULT);
</span><del>- dispatchOnSource(dispatchSource.get(), function, reinterpret_cast<GSourceFunc>(&WorkQueue::EventSource::performWorkOnce));
</del><ins>+ dispatchOnSource(dispatchSource.get(), std::forward<std::function<void ()>>(function),
+ reinterpret_cast<GSourceFunc>(&WorkQueue::EventSource::performWorkOnce));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, const std::function<void ()>& function)
</del><ins>+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, std::function<void ()> function)
</ins><span class="cx"> {
</span><del>- GRefPtr<GSource> dispatchSource = adoptGRef(g_timeout_source_new(static_cast<guint>(std::chrono::milliseconds(duration).count())));
- dispatchOnSource(dispatchSource.get(), function, reinterpret_cast<GSourceFunc>(&WorkQueue::EventSource::performWorkOnce));
</del><ins>+ GRefPtr<GSource> dispatchSource = adoptGRef(g_timeout_source_new(
+ static_cast<guint>(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count())));
+ dispatchOnSource(dispatchSource.get(), std::forward<std::function<void ()>>(function),
+ reinterpret_cast<GSourceFunc>(&WorkQueue::EventSource::performWorkOnce));
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>