<!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>[170106] 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/170106">170106</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-06-18 10:53:33 -0700 (Wed, 18 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ScriptExecutionContext::Task parameters should always be rvalue references
https://bugs.webkit.org/show_bug.cgi?id=133615
Reviewed by Darin Adler.
ScriptExecutionContext::Task parameters should be rvalue references as the
passed-in objects are always ScriptExecutionContext::Task rvalues that were
implicitly constructed from a lambda function or rvalues of objects that
derive from ScriptExecutionContext::Task.
This isn't really necessary since ScriptExecutionContext::Task is non-copyable
and we have to use move semantics anyway, but it makes it clear that these
objects are expiring rvalues that must be properly dealt with.
* dom/Document.cpp:
(WebCore::Document::postTask):
* dom/Document.h:
* dom/ScriptExecutionContext.h:
* workers/DefaultSharedWorkerRepository.cpp:
(WebCore::SharedWorkerProxy::postTaskToLoader):
(WebCore::SharedWorkerProxy::postTaskForModeToWorkerGlobalScope):
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::postTask):
* workers/WorkerGlobalScope.h:
* workers/WorkerLoaderProxy.h:
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::postTaskToLoader):
(WebCore::WorkerMessagingProxy::postTaskForModeToWorkerGlobalScope):
* workers/WorkerMessagingProxy.h:
* workers/WorkerRunLoop.cpp:
(WebCore::WorkerRunLoop::postTask):
(WebCore::WorkerRunLoop::postTaskAndTerminate):
(WebCore::WorkerRunLoop::postTaskForMode):
(WebCore::WorkerRunLoop::Task::create):
(WebCore::WorkerRunLoop::Task::Task):
* workers/WorkerRunLoop.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp">trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp</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>
<li><a href="#trunkSourceWebCoreworkersWorkerLoaderProxyh">trunk/Source/WebCore/workers/WorkerLoaderProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxyh">trunk/Source/WebCore/workers/WorkerMessagingProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerRunLoopcpp">trunk/Source/WebCore/workers/WorkerRunLoop.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerRunLooph">trunk/Source/WebCore/workers/WorkerRunLoop.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170105 => 170106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-18 17:48:25 UTC (rev 170105)
+++ trunk/Source/WebCore/ChangeLog 2014-06-18 17:53:33 UTC (rev 170106)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2014-06-18 Zan Dobersek <zdobersek@igalia.com>
+
+ ScriptExecutionContext::Task parameters should always be rvalue references
+ https://bugs.webkit.org/show_bug.cgi?id=133615
+
+ Reviewed by Darin Adler.
+
+ ScriptExecutionContext::Task parameters should be rvalue references as the
+ passed-in objects are always ScriptExecutionContext::Task rvalues that were
+ implicitly constructed from a lambda function or rvalues of objects that
+ derive from ScriptExecutionContext::Task.
+
+ This isn't really necessary since ScriptExecutionContext::Task is non-copyable
+ and we have to use move semantics anyway, but it makes it clear that these
+ objects are expiring rvalues that must be properly dealt with.
+
+ * dom/Document.cpp:
+ (WebCore::Document::postTask):
+ * dom/Document.h:
+ * dom/ScriptExecutionContext.h:
+ * workers/DefaultSharedWorkerRepository.cpp:
+ (WebCore::SharedWorkerProxy::postTaskToLoader):
+ (WebCore::SharedWorkerProxy::postTaskForModeToWorkerGlobalScope):
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::postTask):
+ * workers/WorkerGlobalScope.h:
+ * workers/WorkerLoaderProxy.h:
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::postTaskToLoader):
+ (WebCore::WorkerMessagingProxy::postTaskForModeToWorkerGlobalScope):
+ * workers/WorkerMessagingProxy.h:
+ * workers/WorkerRunLoop.cpp:
+ (WebCore::WorkerRunLoop::postTask):
+ (WebCore::WorkerRunLoop::postTaskAndTerminate):
+ (WebCore::WorkerRunLoop::postTaskForMode):
+ (WebCore::WorkerRunLoop::Task::create):
+ (WebCore::WorkerRunLoop::Task::Task):
+ * workers/WorkerRunLoop.h:
+
</ins><span class="cx"> 2014-06-18 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Compile errors when trying to compile CA code.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (170105 => 170106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-06-18 17:48:25 UTC (rev 170105)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-06-18 17:53:33 UTC (rev 170106)
</span><span class="lines">@@ -4905,7 +4905,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"> Task* taskPtr = std::make_unique<Task>(std::move(task)).release();
</span><span class="cx"> WeakPtr<Document> documentReference(m_weakFactory.createWeakPtr());
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (170105 => 170106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-06-18 17:48:25 UTC (rev 170105)
+++ trunk/Source/WebCore/dom/Document.h 2014-06-18 17:53:33 UTC (rev 170106)
</span><span class="lines">@@ -1008,7 +1008,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>- virtual void postTask(Task) override; // Executes the task on context's thread asynchronously.
</del><ins>+ virtual void postTask(Task&&) override; // Executes the task on context's thread asynchronously.
</ins><span class="cx">
</span><span class="cx"> void suspendScriptedAnimationControllerCallbacks();
</span><span class="cx"> void resumeScriptedAnimationControllerCallbacks();
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (170105 => 170106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-06-18 17:48:25 UTC (rev 170105)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-06-18 17:53:33 UTC (rev 170106)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><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"> // Gets the next id in a circular sequence from 1 to 2^31-1.
</span><span class="cx"> int circularSequentialID();
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp (170105 => 170106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-06-18 17:48:25 UTC (rev 170105)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-06-18 17:53:33 UTC (rev 170106)
</span><span class="lines">@@ -80,8 +80,8 @@
</span><span class="cx"> bool matches(const String& name, PassRefPtr<SecurityOrigin> origin, const URL& urlToMatch) const;
</span><span class="cx">
</span><span class="cx"> // WorkerLoaderProxy
</span><del>- virtual void postTaskToLoader(ScriptExecutionContext::Task);
- virtual bool postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task, const String&);
</del><ins>+ virtual void postTaskToLoader(ScriptExecutionContext::Task&&);
+ virtual bool postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task&&, const String&);
</ins><span class="cx">
</span><span class="cx"> // WorkerReportingProxy
</span><span class="cx"> virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL);
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> return name == m_name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SharedWorkerProxy::postTaskToLoader(ScriptExecutionContext::Task task)
</del><ins>+void SharedWorkerProxy::postTaskToLoader(ScriptExecutionContext::Task&& task)
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker lock(m_workerDocumentsLock);
</span><span class="cx">
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> document->postTask(std::move(task));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SharedWorkerProxy::postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task task, const String& mode)
</del><ins>+bool SharedWorkerProxy::postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task&& task, const String& mode)
</ins><span class="cx"> {
</span><span class="cx"> if (isClosing())
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (170105 => 170106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2014-06-18 17:48:25 UTC (rev 170105)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2014-06-18 17:53:33 UTC (rev 170106)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> return m_navigator.get();
</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(std::move(task));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (170105 => 170106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2014-06-18 17:48:25 UTC (rev 170105)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h 2014-06-18 17:53:33 UTC (rev 170106)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> using ScriptExecutionContext::hasPendingActivity;
</span><span class="cx">
</span><del>- virtual void postTask(Task) override; // Executes the task on context's thread asynchronously.
</del><ins>+ virtual void postTask(Task&&) override; // 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>
<a id="trunkSourceWebCoreworkersWorkerLoaderProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerLoaderProxy.h (170105 => 170106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerLoaderProxy.h 2014-06-18 17:48:25 UTC (rev 170105)
+++ trunk/Source/WebCore/workers/WorkerLoaderProxy.h 2014-06-18 17:53:33 UTC (rev 170106)
</span><span class="lines">@@ -46,12 +46,12 @@
</span><span class="cx"> virtual ~WorkerLoaderProxy() { }
</span><span class="cx">
</span><span class="cx"> // Posts a task to the thread which runs the loading code (normally, the main thread).
</span><del>- virtual void postTaskToLoader(ScriptExecutionContext::Task) = 0;
</del><ins>+ virtual void postTaskToLoader(ScriptExecutionContext::Task&&) = 0;
</ins><span class="cx">
</span><span class="cx"> // Posts callbacks from loading code to the WorkerGlobalScope. The 'mode' is used to differentiate
</span><span class="cx"> // specific synchronous loading requests so they can be 'nested', per spec.
</span><span class="cx"> // Returns true if the task was posted successfully.
</span><del>- virtual bool postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task, const String& mode) = 0;
</del><ins>+ virtual bool postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task&&, const String& mode) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (170105 => 170106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-06-18 17:48:25 UTC (rev 170105)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-06-18 17:53:33 UTC (rev 170106)
</span><span class="lines">@@ -127,8 +127,15 @@
</span><span class="cx"> m_queuedEarlyTasks.append(std::make_unique<ScriptExecutionContext::Task>(std::move(task)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WorkerMessagingProxy::postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task task, const String& mode)
</del><ins>+void WorkerMessagingProxy::postTaskToLoader(ScriptExecutionContext::Task&& task)
</ins><span class="cx"> {
</span><ins>+ // FIXME: In case of nested workers, this should go directly to the root Document context.
+ ASSERT(m_scriptExecutionContext->isDocument());
+ m_scriptExecutionContext->postTask(std::move(task));
+}
+
+bool WorkerMessagingProxy::postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task&& task, const String& mode)
+{
</ins><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -137,13 +144,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerMessagingProxy::postTaskToLoader(ScriptExecutionContext::Task task)
-{
- // FIXME: In case of nested workers, this should go directly to the root Document context.
- ASSERT(m_scriptExecutionContext->isDocument());
- m_scriptExecutionContext->postTask(std::move(task));
-}
-
</del><span class="cx"> void WorkerMessagingProxy::postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><span class="cx"> String errorMessageCopy = errorMessage.isolatedCopy();
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.h (170105 => 170106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2014-06-18 17:48:25 UTC (rev 170105)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2014-06-18 17:53:33 UTC (rev 170106)
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> // Implementation of WorkerLoaderProxy.
</span><span class="cx"> // These methods are called on different threads to schedule loading
</span><span class="cx"> // requests and to send callbacks back to WorkerGlobalScope.
</span><del>- virtual void postTaskToLoader(ScriptExecutionContext::Task) override;
- virtual bool postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task, const String& mode) override;
</del><ins>+ virtual void postTaskToLoader(ScriptExecutionContext::Task&&) override;
+ virtual bool postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task&&, const String& mode) override;
</ins><span class="cx">
</span><span class="cx"> void workerThreadCreated(PassRefPtr<DedicatedWorkerThread>);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerRunLoopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerRunLoop.cpp (170105 => 170106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerRunLoop.cpp 2014-06-18 17:48:25 UTC (rev 170105)
+++ trunk/Source/WebCore/workers/WorkerRunLoop.cpp 2014-06-18 17:53:33 UTC (rev 170106)
</span><span class="lines">@@ -192,22 +192,22 @@
</span><span class="cx"> m_messageQueue.kill();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerRunLoop::postTask(ScriptExecutionContext::Task task)
</del><ins>+void WorkerRunLoop::postTask(ScriptExecutionContext::Task&& task)
</ins><span class="cx"> {
</span><span class="cx"> postTaskForMode(std::move(task), defaultMode());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerRunLoop::postTaskAndTerminate(ScriptExecutionContext::Task task)
</del><ins>+void WorkerRunLoop::postTaskAndTerminate(ScriptExecutionContext::Task&& task)
</ins><span class="cx"> {
</span><span class="cx"> m_messageQueue.appendAndKill(Task::create(std::move(task), defaultMode().isolatedCopy()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerRunLoop::postTaskForMode(ScriptExecutionContext::Task task, const String& mode)
</del><ins>+void WorkerRunLoop::postTaskForMode(ScriptExecutionContext::Task&& task, const String& mode)
</ins><span class="cx"> {
</span><span class="cx"> m_messageQueue.append(Task::create(std::move(task), mode.isolatedCopy()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<WorkerRunLoop::Task> WorkerRunLoop::Task::create(ScriptExecutionContext::Task task, const String& mode)
</del><ins>+std::unique_ptr<WorkerRunLoop::Task> WorkerRunLoop::Task::create(ScriptExecutionContext::Task&& task, const String& mode)
</ins><span class="cx"> {
</span><span class="cx"> return std::unique_ptr<Task>(new Task(std::move(task), mode));
</span><span class="cx"> }
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> m_task.performTask(*context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WorkerRunLoop::Task::Task(ScriptExecutionContext::Task task, const String& mode)
</del><ins>+WorkerRunLoop::Task::Task(ScriptExecutionContext::Task&& task, const String& mode)
</ins><span class="cx"> : m_task(std::move(task))
</span><span class="cx"> , m_mode(mode.isolatedCopy())
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerRunLoop.h (170105 => 170106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerRunLoop.h 2014-06-18 17:48:25 UTC (rev 170105)
+++ trunk/Source/WebCore/workers/WorkerRunLoop.h 2014-06-18 17:53:33 UTC (rev 170106)
</span><span class="lines">@@ -57,9 +57,9 @@
</span><span class="cx"> void terminate();
</span><span class="cx"> bool terminated() const { return m_messageQueue.killed(); }
</span><span class="cx">
</span><del>- void postTask(ScriptExecutionContext::Task);
- void postTaskAndTerminate(ScriptExecutionContext::Task);
- void postTaskForMode(ScriptExecutionContext::Task, const String& mode);
</del><ins>+ void postTask(ScriptExecutionContext::Task&&);
+ void postTaskAndTerminate(ScriptExecutionContext::Task&&);
+ void postTaskForMode(ScriptExecutionContext::Task&&, const String& mode);
</ins><span class="cx">
</span><span class="cx"> unsigned long createUniqueId() { return ++m_uniqueId; }
</span><span class="cx">
</span><span class="lines">@@ -68,13 +68,13 @@
</span><span class="cx"> class Task {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(Task); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static std::unique_ptr<Task> create(ScriptExecutionContext::Task, const String& mode);
</del><ins>+ static std::unique_ptr<Task> create(ScriptExecutionContext::Task&&, const String& mode);
</ins><span class="cx"> ~Task() { }
</span><span class="cx"> const String& mode() const { return m_mode; }
</span><span class="cx"> void performTask(const WorkerRunLoop&, WorkerGlobalScope*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Task(ScriptExecutionContext::Task task, const String& mode);
</del><ins>+ Task(ScriptExecutionContext::Task&&, const String& mode);
</ins><span class="cx">
</span><span class="cx"> ScriptExecutionContext::Task m_task;
</span><span class="cx"> String m_mode;
</span></span></pre>
</div>
</div>
</body>
</html>