<!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>[201496] trunk/Source/WebCore</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/201496">201496</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-29 21:30:22 -0700 (Sun, 29 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make ScriptExecutionContext::Task work in terms of wtf::NoncopyableFunction instead of std::function.
https://bugs.webkit.org/show_bug.cgi?id=158187
Reviewed by Chris Dumez.
No new tests (Refactor, no behavior change).
Also make postTask take an rvalue reference.
* bindings/js/JSDOMGlobalObjectTask.cpp:
(WebCore::JSGlobalObjectTask::JSGlobalObjectTask):
* dom/Document.cpp:
(WebCore::Document::postTask):
* dom/Document.h:
* dom/ScriptExecutionContext.h:
(WebCore::ScriptExecutionContext::Task::Task):
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::postTask):
* workers/WorkerGlobalScope.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMGlobalObjectTaskcpp">trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeh">trunk/Source/WebCore/workers/WorkerGlobalScope.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201495 => 201496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-29 19:01:36 UTC (rev 201495)
+++ trunk/Source/WebCore/ChangeLog 2016-05-30 04:30:22 UTC (rev 201496)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-05-29 Brady Eidson <beidson@apple.com>
+
+ Make ScriptExecutionContext::Task work in terms of wtf::NoncopyableFunction instead of std::function.
+ https://bugs.webkit.org/show_bug.cgi?id=158187
+
+ Reviewed by Chris Dumez.
+
+ No new tests (Refactor, no behavior change).
+
+ Also make postTask take an rvalue reference.
+
+ * bindings/js/JSDOMGlobalObjectTask.cpp:
+ (WebCore::JSGlobalObjectTask::JSGlobalObjectTask):
+
+ * dom/Document.cpp:
+ (WebCore::Document::postTask):
+ * dom/Document.h:
+
+ * dom/ScriptExecutionContext.h:
+ (WebCore::ScriptExecutionContext::Task::Task):
+
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::postTask):
+ * workers/WorkerGlobalScope.h:
+
</ins><span class="cx"> 2016-05-28 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Templatize NoncopyableFunction class similarly to std::function
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMGlobalObjectTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp (201495 => 201496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp 2016-05-29 19:01:36 UTC (rev 201495)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp 2016-05-30 04:30:22 UTC (rev 201496)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> JSGlobalObjectTask::JSGlobalObjectTask(JSDOMGlobalObject* globalObject, Ref<Microtask>&& task)
</span><del>- : ScriptExecutionContext::Task(nullptr)
</del><ins>+ : ScriptExecutionContext::Task({ })
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<JSGlobalObjectCallback> callback = JSGlobalObjectCallback::create(globalObject, WTFMove(task));
</span><span class="cx"> m_task = [callback] (ScriptExecutionContext&) {
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (201495 => 201496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-05-29 19:01:36 UTC (rev 201495)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-05-30 04:30:22 UTC (rev 201496)
</span><span class="lines">@@ -5384,7 +5384,7 @@
</span><span class="cx"> return topDocument().securityOrigin();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::postTask(Task task)
</del><ins>+void Document::postTask(Task&& task)
</ins><span class="cx"> {
</span><span class="cx"> callOnMainThread([documentReference = m_weakFactory.createWeakPtr(), task = WTFMove(task)]() mutable {
</span><span class="cx"> ASSERT(isMainThread());
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (201495 => 201496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2016-05-29 19:01:36 UTC (rev 201495)
+++ trunk/Source/WebCore/dom/Document.h 2016-05-30 04:30:22 UTC (rev 201496)
</span><span class="lines">@@ -975,7 +975,7 @@
</span><span class="cx"> bool isDNSPrefetchEnabled() const { return m_isDNSPrefetchEnabled; }
</span><span class="cx"> void parseDNSPrefetchControlHeader(const String&);
</span><span class="cx">
</span><del>- void postTask(Task) final; // Executes the task on context's thread asynchronously.
</del><ins>+ void postTask(Task&&) final; // Executes the task on context's thread asynchronously.
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(REQUEST_ANIMATION_FRAME)
</span><span class="cx"> ScriptedAnimationController* scriptedAnimationController() { return m_scriptedAnimationController.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (201495 => 201496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2016-05-29 19:01:36 UTC (rev 201495)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2016-05-30 04:30:22 UTC (rev 201496)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "Supplementable.h"
</span><span class="cx"> #include <runtime/ConsoleTypes.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><ins>+#include <wtf/NoncopyableFunction.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx"> class ExecState;
</span><span class="lines">@@ -132,20 +133,20 @@
</span><span class="cx"> public:
</span><span class="cx"> enum CleanupTaskTag { CleanupTask };
</span><span class="cx">
</span><del>- template<typename T, typename = typename std::enable_if<!std::is_base_of<Task, T>::value && std::is_convertible<T, std::function<void (ScriptExecutionContext&)>>::value>::type>
</del><ins>+ template<typename T, typename = typename std::enable_if<!std::is_base_of<Task, T>::value && std::is_convertible<T, NoncopyableFunction<void (ScriptExecutionContext&)>>::value>::type>
</ins><span class="cx"> Task(T task)
</span><span class="cx"> : m_task(WTFMove(task))
</span><span class="cx"> , m_isCleanupTask(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Task(std::function<void()> task)
</del><ins>+ Task(std::function<void ()> task)
</ins><span class="cx"> : m_task([task](ScriptExecutionContext&) { task(); })
</span><span class="cx"> , m_isCleanupTask(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename T, typename = typename std::enable_if<std::is_convertible<T, std::function<void (ScriptExecutionContext&)>>::value>::type>
</del><ins>+ template<typename T, typename = typename std::enable_if<std::is_convertible<T, NoncopyableFunction<void (ScriptExecutionContext&)>>::value>::type>
</ins><span class="cx"> Task(CleanupTaskTag, T task)
</span><span class="cx"> : m_task(WTFMove(task))
</span><span class="cx"> , m_isCleanupTask(true)
</span><span class="lines">@@ -162,11 +163,11 @@
</span><span class="cx"> bool isCleanupTask() const { return m_isCleanupTask; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- std::function<void (ScriptExecutionContext&)> m_task;
</del><ins>+ NoncopyableFunction<void (ScriptExecutionContext&)> m_task;
</ins><span class="cx"> bool m_isCleanupTask;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- virtual void postTask(Task) = 0; // Executes the task on context's thread asynchronously.
</del><ins>+ virtual void postTask(Task&&) = 0; // Executes the task on context's thread asynchronously.
</ins><span class="cx">
</span><span class="cx"> template<typename... Arguments>
</span><span class="cx"> void postCrossThreadTask(Arguments&&... arguments)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (201495 => 201496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2016-05-29 19:01:36 UTC (rev 201495)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2016-05-30 04:30:22 UTC (rev 201496)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> return *m_navigator;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerGlobalScope::postTask(Task task)
</del><ins>+void WorkerGlobalScope::postTask(Task&& task)
</ins><span class="cx"> {
</span><span class="cx"> thread().runLoop().postTask(WTFMove(task));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (201495 => 201496)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2016-05-29 19:01:36 UTC (rev 201495)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h 2016-05-30 04:30:22 UTC (rev 201496)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> using ScriptExecutionContext::hasPendingActivity;
</span><span class="cx">
</span><del>- void postTask(Task) override; // Executes the task on context's thread asynchronously.
</del><ins>+ void postTask(Task&&) final; // Executes the task on context's thread asynchronously.
</ins><span class="cx">
</span><span class="cx"> // WorkerGlobalScope
</span><span class="cx"> WorkerGlobalScope& self() { return *this; }
</span></span></pre>
</div>
</div>
</body>
</html>