<!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>[167904] 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/167904">167904</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-28 13:55:09 -0700 (Mon, 28 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/167855">r167855</a>.
https://bugs.webkit.org/show_bug.cgi?id=132301
Broke the windows build (Requested by bfulgham on #webkit).
Reverted changeset:
"ScriptExecutionContext::Task should work well with C++11
lambdas"
https://bugs.webkit.org/show_bug.cgi?id=129795
http://trac.webkit.org/changeset/167855</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesquotaStorageErrorCallbackcpp">trunk/Source/WebCore/Modules/quota/StorageErrorCallback.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesquotaStorageErrorCallbackh">trunk/Source/WebCore/Modules/quota/StorageErrorCallback.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabasecpp">trunk/Source/WebCore/Modules/webdatabase/Database.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseDatabaseSynccpp">trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebdatabaseSQLCallbackWrapperh">trunk/Source/WebCore/Modules/webdatabase/SQLCallbackWrapper.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrappercpp">trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrapperh">trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh">trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCallbackDatah">trunk/Source/WebCore/bindings/js/JSCallbackData.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMGlobalObjectTaskcpp">trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMGlobalObjectTaskh">trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowBasecpp">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWorkerGlobalScopeBasecpp">trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCoredomCrossThreadTaskh">trunk/Source/WebCore/dom/CrossThreadTask.h</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="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCoredomStringCallbackcpp">trunk/Source/WebCore/dom/StringCallback.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp">trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerEventQueuecpp">trunk/Source/WebCore/workers/WorkerEventQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerEventQueueh">trunk/Source/WebCore/workers/WorkerEventQueue.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>
<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>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadcpp">trunk/Source/WebCore/workers/WorkerThread.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/ChangeLog 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-28 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r167855.
+ https://bugs.webkit.org/show_bug.cgi?id=132301
+
+ Broke the windows build (Requested by bfulgham on #webkit).
+
+ Reverted changeset:
+
+ "ScriptExecutionContext::Task should work well with C++11
+ lambdas"
+ https://bugs.webkit.org/show_bug.cgi?id=129795
+ http://trac.webkit.org/changeset/167855
+
</ins><span class="cx"> 2014-04-24 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Implement WebQuickLookHandleClient for WebKit2
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesquotaStorageErrorCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/quota/StorageErrorCallback.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/quota/StorageErrorCallback.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/Modules/quota/StorageErrorCallback.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -40,13 +40,19 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> StorageErrorCallback::CallbackTask::CallbackTask(PassRefPtr<StorageErrorCallback> callback, ExceptionCode ec)
</span><del>- : ScriptExecutionContext::Task([=] (ScriptExecutionContext*) {
- if (callback)
- callback->handleEvent(DOMCoreException::create(ExceptionCodeDescription(ec)).get());
- })
</del><ins>+ : m_callback(callback)
+ , m_ec(ec)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void StorageErrorCallback::CallbackTask::performTask(ScriptExecutionContext*)
+{
+ if (!m_callback)
+ return;
+ ExceptionCodeDescription description(m_ec);
+ m_callback->handleEvent(DOMCoreException::create(description).get());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(QUOTA)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesquotaStorageErrorCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/quota/StorageErrorCallback.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/quota/StorageErrorCallback.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/Modules/quota/StorageErrorCallback.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -50,9 +50,16 @@
</span><span class="cx">
</span><span class="cx"> class CallbackTask : public ScriptExecutionContext::Task {
</span><span class="cx"> public:
</span><ins>+ static PassOwnPtr<CallbackTask> create(PassRefPtr<StorageErrorCallback> callback, ExceptionCode ec)
+ {
+ return adoptPtr(new CallbackTask(callback, ec));
+ }
+
+ virtual void performTask(ScriptExecutionContext*);
+
+ private:
</ins><span class="cx"> CallbackTask(PassRefPtr<StorageErrorCallback>, ExceptionCode);
</span><span class="cx">
</span><del>- private:
</del><span class="cx"> RefPtr<StorageErrorCallback> m_callback;
</span><span class="cx"> ExceptionCode m_ec;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -87,17 +87,39 @@
</span><span class="cx"> ASSERT(m_databaseContext->databaseThread());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class DerefContextTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<DerefContextTask> create(PassRefPtr<ScriptExecutionContext> context)
+ {
+ return adoptPtr(new DerefContextTask(context));
+ }
+
+ virtual void performTask(ScriptExecutionContext* context)
+ {
+ ASSERT_UNUSED(context, context == m_context);
+ m_context.clear();
+ }
+
+ virtual bool isCleanupTask() const { return true; }
+
+private:
+ DerefContextTask(PassRefPtr<ScriptExecutionContext> context)
+ : m_context(context)
+ {
+ }
+
+ RefPtr<ScriptExecutionContext> m_context;
+};
+
</ins><span class="cx"> Database::~Database()
</span><span class="cx"> {
</span><span class="cx"> // The reference to the ScriptExecutionContext needs to be cleared on the JavaScript thread. If we're on that thread already, we can just let the RefPtr's destruction do the dereffing.
</span><span class="cx"> if (!m_scriptExecutionContext->isContextThread()) {
</span><span class="cx"> // Grab a pointer to the script execution here because we're releasing it when we pass it to
</span><span class="cx"> // DerefContextTask::create.
</span><del>- PassRefPtr<ScriptExecutionContext> passedContext = m_scriptExecutionContext.release();
- passedContext->postTask({ScriptExecutionContext::Task::CleanupTask, [=] (ScriptExecutionContext* context) {
- ASSERT_UNUSED(context, context == passedContext);
- RefPtr<ScriptExecutionContext> scriptExecutionContext(passedContext);
- }});
</del><ins>+ ScriptExecutionContext* scriptExecutionContext = m_scriptExecutionContext.get();
+
+ scriptExecutionContext->postTask(DerefContextTask::create(m_scriptExecutionContext.release()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -165,25 +187,49 @@
</span><span class="cx"> runTransaction(callback, errorCallback, successCallback, true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void callTransactionErrorCallback(ScriptExecutionContext*, PassRefPtr<SQLTransactionErrorCallback> callback, PassRefPtr<SQLError> error)
+{
+ callback->handleEvent(error.get());
+}
+
</ins><span class="cx"> void Database::runTransaction(PassRefPtr<SQLTransactionCallback> callback, PassRefPtr<SQLTransactionErrorCallback> errorCallback,
</span><span class="cx"> PassRefPtr<VoidCallback> successCallback, bool readOnly, const ChangeVersionData* changeVersionData)
</span><span class="cx"> {
</span><del>- RefPtr<SQLTransactionErrorCallback> errorCallbackProtector(errorCallback);
- RefPtr<SQLTransaction> transaction = SQLTransaction::create(this, callback, successCallback, errorCallbackProtector, readOnly);
</del><ins>+ RefPtr<SQLTransactionErrorCallback> anotherRefToErrorCallback = errorCallback;
+ RefPtr<SQLTransaction> transaction = SQLTransaction::create(this, callback, successCallback, anotherRefToErrorCallback, readOnly);
</ins><span class="cx">
</span><del>- RefPtr<SQLTransactionBackend> transactionBackend(backend()->runTransaction(transaction.release(), readOnly, changeVersionData));
- if (!transactionBackend && errorCallbackProtector)
- scriptExecutionContext()->postTask([=] (ScriptExecutionContext*) {
- errorCallbackProtector->handleEvent(SQLError::create(SQLError::UNKNOWN_ERR, "database has been closed").get());
- });
</del><ins>+ RefPtr<SQLTransactionBackend> transactionBackend;
+ transactionBackend = backend()->runTransaction(transaction.release(), readOnly, changeVersionData);
+ if (!transactionBackend && anotherRefToErrorCallback) {
+ RefPtr<SQLError> error = SQLError::create(SQLError::UNKNOWN_ERR, "database has been closed");
+ scriptExecutionContext()->postTask(createCallbackTask(&callTransactionErrorCallback, anotherRefToErrorCallback, error.release()));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+class DeliverPendingCallbackTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<DeliverPendingCallbackTask> create(PassRefPtr<SQLTransaction> transaction)
+ {
+ return adoptPtr(new DeliverPendingCallbackTask(transaction));
+ }
+
+ virtual void performTask(ScriptExecutionContext*)
+ {
+ m_transaction->performPendingCallback();
+ }
+
+private:
+ DeliverPendingCallbackTask(PassRefPtr<SQLTransaction> transaction)
+ : m_transaction(transaction)
+ {
+ }
+
+ RefPtr<SQLTransaction> m_transaction;
+};
+
</ins><span class="cx"> void Database::scheduleTransactionCallback(SQLTransaction* transaction)
</span><span class="cx"> {
</span><del>- RefPtr<SQLTransaction> transactionProtector(transaction);
- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext*) {
- transactionProtector->performPendingCallback();
- });
</del><ins>+ m_scriptExecutionContext->postTask(DeliverPendingCallbackTask::create(transaction));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> Database::performGetTableNames()
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -117,6 +117,29 @@
</span><span class="cx"> m_databaseIsAvailable = available;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class DatabaseCreationCallbackTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<DatabaseCreationCallbackTask> create(PassRefPtr<Database> database, PassRefPtr<DatabaseCallback> creationCallback)
+ {
+ return adoptPtr(new DatabaseCreationCallbackTask(database, creationCallback));
+ }
+
+ virtual void performTask(ScriptExecutionContext*)
+ {
+ m_creationCallback->handleEvent(m_database.get());
+ }
+
+private:
+ DatabaseCreationCallbackTask(PassRefPtr<Database> database, PassRefPtr<DatabaseCallback> callback)
+ : m_database(database)
+ , m_creationCallback(callback)
+ {
+ }
+
+ RefPtr<Database> m_database;
+ RefPtr<DatabaseCallback> m_creationCallback;
+};
+
</ins><span class="cx"> PassRefPtr<DatabaseContext> DatabaseManager::existingDatabaseContextFor(ScriptExecutionContext* context)
</span><span class="cx"> {
</span><span class="cx"> std::lock_guard<std::mutex> lock(m_mutex);
</span><span class="lines">@@ -311,9 +334,7 @@
</span><span class="cx">
</span><span class="cx"> if (backend->isNew() && creationCallback.get()) {
</span><span class="cx"> LOG(StorageAPI, "Scheduling DatabaseCreationCallbackTask for database %p\n", database.get());
</span><del>- database->m_scriptExecutionContext->postTask([=] (ScriptExecutionContext*) {
- creationCallback->handleEvent(database.get());
- });
</del><ins>+ database->m_scriptExecutionContext->postTask(DatabaseCreationCallbackTask::create(database, creationCallback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(database);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseSynccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -158,6 +158,27 @@
</span><span class="cx"> // FIXME: need to do something similar to closeImmediately(), but in a sync way
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class CloseSyncDatabaseOnContextThreadTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<CloseSyncDatabaseOnContextThreadTask> create(PassRefPtr<DatabaseSync> database)
+ {
+ return adoptPtr(new CloseSyncDatabaseOnContextThreadTask(database));
+ }
+
+ virtual void performTask(ScriptExecutionContext*)
+ {
+ m_database->closeImmediately();
+ }
+
+private:
+ CloseSyncDatabaseOnContextThreadTask(PassRefPtr<DatabaseSync> database)
+ : m_database(database)
+ {
+ }
+
+ RefPtr<DatabaseSync> m_database;
+};
+
</ins><span class="cx"> void DatabaseSync::closeImmediately()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_scriptExecutionContext->isContextThread());
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLCallbackWrapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLCallbackWrapper.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLCallbackWrapper.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLCallbackWrapper.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> void clear()
</span><span class="cx"> {
</span><del>- ScriptExecutionContext* scriptExecutionContextPtr;
</del><ins>+ ScriptExecutionContext* context;
</ins><span class="cx"> T* callback;
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_mutex);
</span><span class="lines">@@ -70,14 +70,10 @@
</span><span class="cx"> m_scriptExecutionContext = 0;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- scriptExecutionContextPtr = m_scriptExecutionContext.release().leakRef();
</del><ins>+ context = m_scriptExecutionContext.release().leakRef();
</ins><span class="cx"> callback = m_callback.release().leakRef();
</span><span class="cx"> }
</span><del>- scriptExecutionContextPtr->postTask({ ScriptExecutionContext::Task::CleanupTask, [=] (ScriptExecutionContext* context) {
- ASSERT_UNUSED(context, context == scriptExecutionContextPtr && context->isContextThread());
- callback->deref();
- scriptExecutionContextPtr->deref();
- } });
</del><ins>+ context->postTask(SafeReleaseTask::create(callback));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<T> unwrap()
</span><span class="lines">@@ -92,6 +88,31 @@
</span><span class="cx"> bool hasCallback() const { return m_callback; }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ class SafeReleaseTask : public ScriptExecutionContext::Task {
+ public:
+ static PassOwnPtr<SafeReleaseTask> create(T* callbackToRelease)
+ {
+ return adoptPtr(new SafeReleaseTask(callbackToRelease));
+ }
+
+ virtual void performTask(ScriptExecutionContext* context)
+ {
+ ASSERT(m_callbackToRelease && context && context->isContextThread());
+ m_callbackToRelease->deref();
+ context->deref();
+ }
+
+ virtual bool isCleanupTask() const { return true; }
+
+ private:
+ explicit SafeReleaseTask(T* callbackToRelease)
+ : m_callbackToRelease(callbackToRelease)
+ {
+ }
+
+ T* m_callbackToRelease;
+ };
+
</ins><span class="cx"> Mutex m_mutex;
</span><span class="cx"> RefPtr<T> m_callback;
</span><span class="cx"> RefPtr<ScriptExecutionContext> m_scriptExecutionContext;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -157,49 +157,49 @@
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didConnect()
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>(createCallbackTask(&didConnectCallback, this)));
</del><ins>+ m_pendingTasks.append(createCallbackTask(&didConnectCallback, this));
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didReceiveMessage(const String& message)
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>(createCallbackTask(&didReceiveMessageCallback, this, message)));
</del><ins>+ m_pendingTasks.append(createCallbackTask(&didReceiveMessageCallback, this, message));
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData(PassOwnPtr<Vector<char>> binaryData)
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>(createCallbackTask(&didReceiveBinaryDataCallback, this, binaryData)));
</del><ins>+ m_pendingTasks.append(createCallbackTask(&didReceiveBinaryDataCallback, this, binaryData));
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmount(unsigned long bufferedAmount)
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>(createCallbackTask(&didUpdateBufferedAmountCallback, this, bufferedAmount)));
</del><ins>+ m_pendingTasks.append(createCallbackTask(&didUpdateBufferedAmountCallback, this, bufferedAmount));
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshake()
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>(createCallbackTask(&didStartClosingHandshakeCallback, this)));
</del><ins>+ m_pendingTasks.append(createCallbackTask(&didStartClosingHandshakeCallback, this));
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didClose(unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>(createCallbackTask(&didCloseCallback, this, unhandledBufferedAmount, closingHandshakeCompletion, code, reason)));
</del><ins>+ m_pendingTasks.append(createCallbackTask(&didCloseCallback, this, unhandledBufferedAmount, closingHandshakeCompletion, code, reason));
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didReceiveMessageError()
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>(createCallbackTask(&didReceiveMessageErrorCallback, this)));
</del><ins>+ m_pendingTasks.append(createCallbackTask(&didReceiveMessageErrorCallback, this));
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="lines">@@ -231,10 +231,10 @@
</span><span class="cx"> m_context->postTask(createCallbackTask(&ThreadableWebSocketChannelClientWrapper::processPendingTasksCallback, this));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- Vector<std::unique_ptr<ScriptExecutionContext::Task>> pendingTasks = std::move(m_pendingTasks);
- for (auto& task : pendingTasks)
- task->performTask(nullptr);
</del><ins>+ Vector<OwnPtr<ScriptExecutionContext::Task>> tasks;
+ tasks.swap(m_pendingTasks);
+ for (Vector<OwnPtr<ScriptExecutionContext::Task>>::const_iterator iter = tasks.begin(); iter != tasks.end(); ++iter)
+ (*iter)->performTask(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "ThreadableWebSocketChannel.h"
</span><span class="cx"> #include "WebSocketChannelClient.h"
</span><span class="cx"> #include "WorkerThreadableWebSocketChannel.h"
</span><del>-#include <memory>
</del><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="lines">@@ -115,7 +114,7 @@
</span><span class="cx"> ThreadableWebSocketChannel::SendResult m_sendRequestResult;
</span><span class="cx"> unsigned long m_bufferedAmount;
</span><span class="cx"> bool m_suspended;
</span><del>- Vector<std::unique_ptr<ScriptExecutionContext::Task>> m_pendingTasks;
</del><ins>+ Vector<OwnPtr<ScriptExecutionContext::Task>> m_pendingTasks;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -359,6 +359,44 @@
</span><span class="cx"> disconnect();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class WorkerThreadableWebSocketChannel::WorkerGlobalScopeDidInitializeTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<ScriptExecutionContext::Task> create(WorkerThreadableWebSocketChannel::Peer* peer,
+ WorkerLoaderProxy* loaderProxy,
+ PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
+ {
+ return adoptPtr(new WorkerGlobalScopeDidInitializeTask(peer, loaderProxy, workerClientWrapper));
+ }
+
+ virtual ~WorkerGlobalScopeDidInitializeTask() { }
+ virtual void performTask(ScriptExecutionContext* context) override
+ {
+ ASSERT_UNUSED(context, context->isWorkerGlobalScope());
+ if (m_workerClientWrapper->failedWebSocketChannelCreation()) {
+ // If Bridge::initialize() quitted earlier, we need to kick mainThreadDestroy() to delete the peer.
+ OwnPtr<WorkerThreadableWebSocketChannel::Peer> peer = adoptPtr(m_peer);
+ m_peer = 0;
+ m_loaderProxy->postTaskToLoader(createCallbackTask(&WorkerThreadableWebSocketChannel::mainThreadDestroy, peer.release()));
+ } else
+ m_workerClientWrapper->didCreateWebSocketChannel(m_peer);
+ }
+ virtual bool isCleanupTask() const override { return true; }
+
+private:
+ WorkerGlobalScopeDidInitializeTask(WorkerThreadableWebSocketChannel::Peer* peer,
+ WorkerLoaderProxy* loaderProxy,
+ PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
+ : m_peer(peer)
+ , m_loaderProxy(loaderProxy)
+ , m_workerClientWrapper(workerClientWrapper)
+ {
+ }
+
+ WorkerThreadableWebSocketChannel::Peer* m_peer;
+ WorkerLoaderProxy* m_loaderProxy;
+ RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;
+};
+
</ins><span class="cx"> void WorkerThreadableWebSocketChannel::Bridge::mainThreadInitialize(ScriptExecutionContext* context, WorkerLoaderProxy* loaderProxy, PassRefPtr<ThreadableWebSocketChannelClientWrapper> prpClientWrapper, const String& taskMode)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="lines">@@ -366,18 +404,12 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper = prpClientWrapper;
</span><span class="cx">
</span><del>- Peer* peerPtr = Peer::create(clientWrapper, *loaderProxy, context, taskMode);
- bool sent = loaderProxy->postTaskForModeToWorkerGlobalScope({ ScriptExecutionContext::Task::CleanupTask, [=] (ScriptExecutionContext* context) {
- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
- if (clientWrapper->failedWebSocketChannelCreation()) {
- // If Bridge::initialize() quitted earlier, we need to kick mainThreadDestroy() to delete the peer.
- loaderProxy->postTaskToLoader(createCallbackTask(&WorkerThreadableWebSocketChannel::mainThreadDestroy, AllowCrossThreadAccess(peerPtr)));
- } else
- clientWrapper->didCreateWebSocketChannel(peerPtr);
- } }, taskMode);
</del><ins>+ Peer* peer = Peer::create(clientWrapper, *loaderProxy, context, taskMode);
+ bool sent = loaderProxy->postTaskForModeToWorkerGlobalScope(
+ WorkerThreadableWebSocketChannel::WorkerGlobalScopeDidInitializeTask::create(peer, loaderProxy, clientWrapper), taskMode);
</ins><span class="cx"> if (!sent) {
</span><span class="cx"> clientWrapper->clearPeer();
</span><del>- delete peerPtr;
</del><ins>+ delete peer;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -543,21 +575,25 @@
</span><span class="cx"> m_loaderProxy.postTaskToLoader(createCallbackTask(&WorkerThreadableWebSocketChannel::mainThreadFail, AllowCrossThreadAccess(m_peer), reason));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadDestroy(ScriptExecutionContext* context, Peer* peerPtr)
</del><ins>+void WorkerThreadableWebSocketChannel::mainThreadDestroy(ScriptExecutionContext* context, PassOwnPtr<Peer> peer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT_UNUSED(context, context->isDocument());
</span><del>- std::unique_ptr<Peer> peer(peerPtr);
</del><ins>+ ASSERT_UNUSED(peer, peer);
+
+ // Peer object will be deleted even if the task does not run in the main thread's cleanup period, because
+ // the destructor for the task object (created by createCallbackTask()) will automatically delete the peer.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Bridge::disconnect()
</span><span class="cx"> {
</span><span class="cx"> clearClientWrapper();
</span><span class="cx"> if (m_peer) {
</span><del>- m_loaderProxy.postTaskToLoader(createCallbackTask(&WorkerThreadableWebSocketChannel::mainThreadDestroy, AllowCrossThreadAccess(m_peer)));
- m_peer = nullptr;
</del><ins>+ OwnPtr<Peer> peer = adoptPtr(m_peer);
+ m_peer = 0;
+ m_loaderProxy.postTaskToLoader(createCallbackTask(&WorkerThreadableWebSocketChannel::mainThreadDestroy, peer.release()));
</ins><span class="cx"> }
</span><del>- m_workerGlobalScope = nullptr;
</del><ins>+ m_workerGlobalScope = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::mainThreadSuspend(ScriptExecutionContext* context, Peer* peer)
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> static void mainThreadBufferedAmount(ScriptExecutionContext*, Peer*);
</span><span class="cx"> static void mainThreadClose(ScriptExecutionContext*, Peer*, int code, const String& reason);
</span><span class="cx"> static void mainThreadFail(ScriptExecutionContext*, Peer*, const String& reason);
</span><del>- static void mainThreadDestroy(ScriptExecutionContext*, Peer*);
</del><ins>+ static void mainThreadDestroy(ScriptExecutionContext*, PassOwnPtr<Peer>);
</ins><span class="cx"> static void mainThreadSuspend(ScriptExecutionContext*, Peer*);
</span><span class="cx"> static void mainThreadResume(ScriptExecutionContext*, Peer*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCallbackDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCallbackData.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCallbackData.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/bindings/js/JSCallbackData.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -79,12 +79,21 @@
</span><span class="cx">
</span><span class="cx"> class DeleteCallbackDataTask : public ScriptExecutionContext::Task {
</span><span class="cx"> public:
</span><del>- DeleteCallbackDataTask(JSCallbackData* data)
- : ScriptExecutionContext::Task({ ScriptExecutionContext::Task::CleanupTask, [=] (ScriptExecutionContext*) {
- delete data;
- } })
</del><ins>+ static PassOwnPtr<DeleteCallbackDataTask> create(JSCallbackData* data)
</ins><span class="cx"> {
</span><ins>+ return adoptPtr(new DeleteCallbackDataTask(data));
</ins><span class="cx"> }
</span><ins>+
+ virtual void performTask(ScriptExecutionContext*)
+ {
+ delete m_data;
+ }
+ virtual bool isCleanupTask() const { return true; }
+private:
+
+ DeleteCallbackDataTask(JSCallbackData* data) : m_data(data) {}
+
+ JSCallbackData* m_data;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMGlobalObjectTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -80,12 +80,17 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> JSGlobalObjectTask::JSGlobalObjectTask(JSDOMGlobalObject* globalObject, PassRefPtr<Microtask> task)
</span><del>- : ScriptExecutionContext::Task(nullptr)
</del><ins>+ : m_callback(JSGlobalObjectCallback::create(globalObject, task))
</ins><span class="cx"> {
</span><del>- RefPtr<JSGlobalObjectCallback> callback = JSGlobalObjectCallback::create(globalObject, task);
- m_task = [=] (ScriptExecutionContext*) {
- callback->call();
- };
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+JSGlobalObjectTask::~JSGlobalObjectTask()
+{
+}
+
+void JSGlobalObjectTask::performTask(ScriptExecutionContext*)
+{
+ m_callback->call();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMGlobalObjectTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -31,9 +31,23 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class JSGlobalObjectTask : public ScriptExecutionContext::Task {
</del><ins>+class JSGlobalObjectCallback;
+
+class JSGlobalObjectTask final : public ScriptExecutionContext::Task {
</ins><span class="cx"> public:
</span><ins>+ static PassOwnPtr<JSGlobalObjectTask> create(JSDOMGlobalObject* globalObject, PassRefPtr<JSC::Microtask> task)
+ {
+ return adoptPtr(new JSGlobalObjectTask(globalObject, task));
+ }
+
+ virtual ~JSGlobalObjectTask();
+
+private:
</ins><span class="cx"> JSGlobalObjectTask(JSDOMGlobalObject*, PassRefPtr<JSC::Microtask>);
</span><ins>+
+ virtual void performTask(ScriptExecutionContext*) override;
+
+ RefPtr<JSGlobalObjectCallback> m_callback;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> void JSDOMWindowBase::queueTaskToEventLoop(const JSGlobalObject* object, PassRefPtr<Microtask> task)
</span><span class="cx"> {
</span><span class="cx"> const JSDOMWindowBase* thisObject = static_cast<const JSDOMWindowBase*>(object);
</span><del>- thisObject->scriptExecutionContext()->postTask(JSGlobalObjectTask((JSDOMWindowBase*)thisObject, task));
</del><ins>+ thisObject->scriptExecutionContext()->postTask(JSGlobalObjectTask::create((JSDOMWindowBase*)thisObject, task));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSDOMWindowBase::willRemoveFromWindowShell()
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWorkerGlobalScopeBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> void JSWorkerGlobalScopeBase::queueTaskToEventLoop(const JSGlobalObject* object, PassRefPtr<Microtask> task)
</span><span class="cx"> {
</span><span class="cx"> const JSWorkerGlobalScopeBase* thisObject = static_cast<const JSWorkerGlobalScopeBase*>(object);
</span><del>- thisObject->scriptExecutionContext()->postTask(JSGlobalObjectTask((JSDOMGlobalObject*)thisObject, task));
</del><ins>+ thisObject->scriptExecutionContext()->postTask(JSGlobalObjectTask::create((JSDOMGlobalObject*)thisObject, task));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue toJS(ExecState* exec, JSDOMGlobalObject*, WorkerGlobalScope* workerGlobalScope)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -3435,7 +3435,7 @@
</span><span class="cx"> push(@implContent, " if (!context || context->isContextThread())\n");
</span><span class="cx"> push(@implContent, " delete m_data;\n");
</span><span class="cx"> push(@implContent, " else\n");
</span><del>- push(@implContent, " context->postTask(DeleteCallbackDataTask(m_data));\n");
</del><ins>+ push(@implContent, " context->postTask(DeleteCallbackDataTask::create(m_data));\n");
</ins><span class="cx"> push(@implContent, "#ifndef NDEBUG\n");
</span><span class="cx"> push(@implContent, " m_data = 0;\n");
</span><span class="cx"> push(@implContent, "#endif\n");
</span></span></pre></div>
<a id="trunkSourceWebCoredomCrossThreadTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CrossThreadTask.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CrossThreadTask.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/dom/CrossThreadTask.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -57,19 +57,25 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1>
</span><del>-class CrossThreadTask1 {
</del><ins>+class CrossThreadTask1 : public ScriptExecutionContext::Task {
</ins><span class="cx"> public:
</span><span class="cx"> typedef void (*Method)(ScriptExecutionContext*, MP1);
</span><span class="cx"> typedef CrossThreadTask1<P1, MP1> CrossThreadTask;
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
</span><span class="cx">
</span><ins>+ static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1)
+ {
+ return adoptPtr(new CrossThreadTask(method, parameter1));
+ }
+
+private:
</ins><span class="cx"> CrossThreadTask1(Method method, Param1 parameter1)
</span><span class="cx"> : m_method(method)
</span><span class="cx"> , m_parameter1(parameter1)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void performTask(ScriptExecutionContext* context)
</del><ins>+ virtual void performTask(ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx"> (*m_method)(context, m_parameter1);
</span><span class="cx"> }
</span><span class="lines">@@ -80,13 +86,19 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2>
</span><del>-class CrossThreadTask2 {
</del><ins>+class CrossThreadTask2 : public ScriptExecutionContext::Task {
</ins><span class="cx"> public:
</span><span class="cx"> typedef void (*Method)(ScriptExecutionContext*, MP1, MP2);
</span><span class="cx"> typedef CrossThreadTask2<P1, MP1, P2, MP2> CrossThreadTask;
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P1>::ParamType Param1;
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P2>::ParamType Param2;
</span><span class="cx">
</span><ins>+ static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1, Param2 parameter2)
+ {
+ return adoptPtr(new CrossThreadTask(method, parameter1, parameter2));
+ }
+
+private:
</ins><span class="cx"> CrossThreadTask2(Method method, Param1 parameter1, Param2 parameter2)
</span><span class="cx"> : m_method(method)
</span><span class="cx"> , m_parameter1(parameter1)
</span><span class="lines">@@ -94,7 +106,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void performTask(ScriptExecutionContext* context)
</del><ins>+ virtual void performTask(ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx"> (*m_method)(context, m_parameter1, m_parameter2);
</span><span class="cx"> }
</span><span class="lines">@@ -106,7 +118,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
</span><del>-class CrossThreadTask3 {
</del><ins>+class CrossThreadTask3 : public ScriptExecutionContext::Task {
</ins><span class="cx"> public:
</span><span class="cx"> typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3);
</span><span class="cx"> typedef CrossThreadTask3<P1, MP1, P2, MP2, P3, MP3> CrossThreadTask;
</span><span class="lines">@@ -114,6 +126,12 @@
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P2>::ParamType Param2;
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P3>::ParamType Param3;
</span><span class="cx">
</span><ins>+ static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3)
+ {
+ return adoptPtr(new CrossThreadTask(method, parameter1, parameter2, parameter3));
+ }
+
+private:
</ins><span class="cx"> CrossThreadTask3(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3)
</span><span class="cx"> : m_method(method)
</span><span class="cx"> , m_parameter1(parameter1)
</span><span class="lines">@@ -122,7 +140,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void performTask(ScriptExecutionContext* context)
</del><ins>+ virtual void performTask(ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx"> (*m_method)(context, m_parameter1, m_parameter2, m_parameter3);
</span><span class="cx"> }
</span><span class="lines">@@ -135,7 +153,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4>
</span><del>-class CrossThreadTask4 {
</del><ins>+class CrossThreadTask4 : public ScriptExecutionContext::Task {
</ins><span class="cx"> public:
</span><span class="cx"> typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4);
</span><span class="cx"> typedef CrossThreadTask4<P1, MP1, P2, MP2, P3, MP3, P4, MP4> CrossThreadTask;
</span><span class="lines">@@ -144,6 +162,12 @@
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P3>::ParamType Param3;
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P4>::ParamType Param4;
</span><span class="cx">
</span><ins>+ static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4)
+ {
+ return adoptPtr(new CrossThreadTask(method, parameter1, parameter2, parameter3, parameter4));
+ }
+
+private:
</ins><span class="cx"> CrossThreadTask4(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4)
</span><span class="cx"> : m_method(method)
</span><span class="cx"> , m_parameter1(parameter1)
</span><span class="lines">@@ -153,7 +177,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void performTask(ScriptExecutionContext* context)
</del><ins>+ virtual void performTask(ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx"> (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4);
</span><span class="cx"> }
</span><span class="lines">@@ -167,7 +191,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5>
</span><del>-class CrossThreadTask5 {
</del><ins>+class CrossThreadTask5 : public ScriptExecutionContext::Task {
</ins><span class="cx"> public:
</span><span class="cx"> typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5);
</span><span class="cx"> typedef CrossThreadTask5<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5> CrossThreadTask;
</span><span class="lines">@@ -177,6 +201,12 @@
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P4>::ParamType Param4;
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P5>::ParamType Param5;
</span><span class="cx">
</span><ins>+ static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5)
+ {
+ return adoptPtr(new CrossThreadTask(method, parameter1, parameter2, parameter3, parameter4, parameter5));
+ }
+
+private:
</ins><span class="cx"> CrossThreadTask5(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5)
</span><span class="cx"> : m_method(method)
</span><span class="cx"> , m_parameter1(parameter1)
</span><span class="lines">@@ -187,7 +217,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void performTask(ScriptExecutionContext* context)
</del><ins>+ virtual void performTask(ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx"> (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5);
</span><span class="cx"> }
</span><span class="lines">@@ -202,7 +232,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6>
</span><del>-class CrossThreadTask6 {
</del><ins>+class CrossThreadTask6 : public ScriptExecutionContext::Task {
</ins><span class="cx"> public:
</span><span class="cx"> typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6);
</span><span class="cx"> typedef CrossThreadTask6<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6> CrossThreadTask;
</span><span class="lines">@@ -213,6 +243,12 @@
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P5>::ParamType Param5;
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P6>::ParamType Param6;
</span><span class="cx">
</span><ins>+ static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6)
+ {
+ return adoptPtr(new CrossThreadTask(method, parameter1, parameter2, parameter3, parameter4, parameter5, parameter6));
+ }
+
+private:
</ins><span class="cx"> CrossThreadTask6(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6)
</span><span class="cx"> : m_method(method)
</span><span class="cx"> , m_parameter1(parameter1)
</span><span class="lines">@@ -224,7 +260,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void performTask(ScriptExecutionContext* context)
</del><ins>+ virtual void performTask(ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx"> (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5, m_parameter6);
</span><span class="cx"> }
</span><span class="lines">@@ -240,7 +276,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7>
</span><del>-class CrossThreadTask7 {
</del><ins>+class CrossThreadTask7 : public ScriptExecutionContext::Task {
</ins><span class="cx"> public:
</span><span class="cx"> typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7);
</span><span class="cx"> typedef CrossThreadTask7<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6, P7, MP7> CrossThreadTask;
</span><span class="lines">@@ -252,6 +288,12 @@
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P6>::ParamType Param6;
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P7>::ParamType Param7;
</span><span class="cx">
</span><ins>+ static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7)
+ {
+ return adoptPtr(new CrossThreadTask(method, parameter1, parameter2, parameter3, parameter4, parameter5, parameter6, parameter7));
+ }
+
+private:
</ins><span class="cx"> CrossThreadTask7(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7)
</span><span class="cx"> : m_method(method)
</span><span class="cx"> , m_parameter1(parameter1)
</span><span class="lines">@@ -264,7 +306,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void performTask(ScriptExecutionContext* context)
</del><ins>+ virtual void performTask(ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx"> (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5, m_parameter6, m_parameter7);
</span><span class="cx"> }
</span><span class="lines">@@ -281,7 +323,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7, typename P8, typename MP8>
</span><del>-class CrossThreadTask8 {
</del><ins>+class CrossThreadTask8 : public ScriptExecutionContext::Task {
</ins><span class="cx"> public:
</span><span class="cx"> typedef void (*Method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8);
</span><span class="cx"> typedef CrossThreadTask8<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6, P7, MP7, P8, MP8> CrossThreadTask;
</span><span class="lines">@@ -294,6 +336,12 @@
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P7>::ParamType Param7;
</span><span class="cx"> typedef typename CrossThreadTaskTraits<P8>::ParamType Param8;
</span><span class="cx">
</span><ins>+ static PassOwnPtr<CrossThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7, Param8 parameter8)
+ {
+ return adoptPtr(new CrossThreadTask(method, parameter1, parameter2, parameter3, parameter4, parameter5, parameter6, parameter7, parameter8));
+ }
+
+private:
</ins><span class="cx"> CrossThreadTask8(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7, Param8 parameter8)
</span><span class="cx"> : m_method(method)
</span><span class="cx"> , m_parameter1(parameter1)
</span><span class="lines">@@ -307,7 +355,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void performTask(ScriptExecutionContext* context)
</del><ins>+ virtual void performTask(ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx"> (*m_method)(context, m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5, m_parameter6, m_parameter7, m_parameter8);
</span><span class="cx"> }
</span><span class="lines">@@ -325,134 +373,102 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1>
</span><del>-ScriptExecutionContext::Task createCallbackTask(
</del><ins>+PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask(
</ins><span class="cx"> void (*method)(ScriptExecutionContext*, MP1),
</span><span class="cx"> const P1& parameter1)
</span><span class="cx"> {
</span><del>- auto taskPtr = new CrossThreadTask1<typename CrossThreadCopier<P1>::Type, MP1>(
</del><ins>+ return CrossThreadTask1<typename CrossThreadCopier<P1>::Type, MP1>::create(
</ins><span class="cx"> method,
</span><span class="cx"> CrossThreadCopier<P1>::copy(parameter1));
</span><del>- return [=] (ScriptExecutionContext* context) {
- std::unique_ptr<typename std::remove_pointer<decltype(taskPtr)>::type> task(taskPtr);
- task->performTask(context);
- };
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2>
</span><del>-ScriptExecutionContext::Task createCallbackTask(
</del><ins>+PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask(
</ins><span class="cx"> void (*method)(ScriptExecutionContext*, MP1, MP2),
</span><span class="cx"> const P1& parameter1, const P2& parameter2)
</span><span class="cx"> {
</span><del>- auto taskPtr = new CrossThreadTask2<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2>(
</del><ins>+ return CrossThreadTask2<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2>::create(
</ins><span class="cx"> method,
</span><span class="cx"> CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2));
</span><del>- return [=] (ScriptExecutionContext* context) {
- std::unique_ptr<typename std::remove_pointer<decltype(taskPtr)>::type> task(taskPtr);
- task->performTask(context);
- };
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
</span><del>-ScriptExecutionContext::Task createCallbackTask(
</del><ins>+PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask(
</ins><span class="cx"> void (*method)(ScriptExecutionContext*, MP1, MP2, MP3),
</span><span class="cx"> const P1& parameter1, const P2& parameter2, const P3& parameter3)
</span><span class="cx"> {
</span><del>- auto taskPtr = new CrossThreadTask3<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3>(
</del><ins>+ return CrossThreadTask3<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3>::create(
</ins><span class="cx"> method,
</span><span class="cx"> CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
</span><span class="cx"> CrossThreadCopier<P3>::copy(parameter3));
</span><del>- return [=] (ScriptExecutionContext* context) {
- std::unique_ptr<typename std::remove_pointer<decltype(taskPtr)>::type> task(taskPtr);
- task->performTask(context);
- };
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4>
</span><del>-ScriptExecutionContext::Task createCallbackTask(
</del><ins>+PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask(
</ins><span class="cx"> void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4),
</span><span class="cx"> const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4)
</span><span class="cx"> {
</span><del>- auto taskPtr = new CrossThreadTask4<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
- typename CrossThreadCopier<P4>::Type, MP4>(
</del><ins>+ return CrossThreadTask4<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
+ typename CrossThreadCopier<P4>::Type, MP4>::create(
</ins><span class="cx"> method,
</span><span class="cx"> CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
</span><span class="cx"> CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4));
</span><del>- return [=] (ScriptExecutionContext* context) {
- std::unique_ptr<typename std::remove_pointer<decltype(taskPtr)>::type> task(taskPtr);
- task->performTask(context);
- };
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5>
</span><del>-ScriptExecutionContext::Task createCallbackTask(
</del><ins>+PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask(
</ins><span class="cx"> void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5),
</span><span class="cx"> const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5)
</span><span class="cx"> {
</span><del>- auto taskPtr = new CrossThreadTask5<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
- typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5>(
</del><ins>+ return CrossThreadTask5<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
+ typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5>::create(
</ins><span class="cx"> method,
</span><span class="cx"> CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
</span><span class="cx"> CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4),
</span><span class="cx"> CrossThreadCopier<P5>::copy(parameter5));
</span><del>- return [=] (ScriptExecutionContext* context) {
- std::unique_ptr<typename std::remove_pointer<decltype(taskPtr)>::type> task(taskPtr);
- task->performTask(context);
- };
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6>
</span><del>-ScriptExecutionContext::Task createCallbackTask(
</del><ins>+PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask(
</ins><span class="cx"> void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6),
</span><span class="cx"> const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6)
</span><span class="cx"> {
</span><del>- auto taskPtr = new CrossThreadTask6<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
- typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6>(
</del><ins>+ return CrossThreadTask6<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
+ typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6>::create(
</ins><span class="cx"> method,
</span><span class="cx"> CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
</span><span class="cx"> CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4),
</span><span class="cx"> CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6));
</span><del>- return [=] (ScriptExecutionContext* context) {
- std::unique_ptr<typename std::remove_pointer<decltype(taskPtr)>::type> task(taskPtr);
- task->performTask(context);
- };
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7>
</span><del>-ScriptExecutionContext::Task createCallbackTask(
</del><ins>+PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask(
</ins><span class="cx"> void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7),
</span><span class="cx"> const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6, const P7& parameter7)
</span><span class="cx"> {
</span><del>- auto taskPtr = new CrossThreadTask7<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
</del><ins>+ return CrossThreadTask7<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
</ins><span class="cx"> typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6,
</span><del>- typename CrossThreadCopier<P7>::Type, MP7>(
</del><ins>+ typename CrossThreadCopier<P7>::Type, MP7>::create(
</ins><span class="cx"> method,
</span><span class="cx"> CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
</span><span class="cx"> CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4),
</span><span class="cx"> CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6),
</span><span class="cx"> CrossThreadCopier<P7>::copy(parameter7));
</span><del>- return [=] (ScriptExecutionContext* context) {
- std::unique_ptr<typename std::remove_pointer<decltype(taskPtr)>::type> task(taskPtr);
- task->performTask(context);
- };
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7, typename P8, typename MP8>
</span><del>-ScriptExecutionContext::Task createCallbackTask(
- void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8),
- const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6, const P7& parameter7, const P8& parameter8)
</del><ins>+PassOwnPtr<ScriptExecutionContext::Task> createCallbackTask(
+ void (*method)(ScriptExecutionContext*, MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8),
+ const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6, const P7& parameter7, const P8& parameter8)
</ins><span class="cx"> {
</span><del>- auto taskPtr = new CrossThreadTask8<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
</del><ins>+ return CrossThreadTask8<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
</ins><span class="cx"> typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6,
</span><del>- typename CrossThreadCopier<P7>::Type, MP7, typename CrossThreadCopier<P8>::Type, MP8>(
- method,
- CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
- CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4),
- CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6),
- CrossThreadCopier<P7>::copy(parameter7), CrossThreadCopier<P8>::copy(parameter8));
- return [=] (ScriptExecutionContext* context) {
- std::unique_ptr<typename std::remove_pointer<decltype(taskPtr)>::type> task(taskPtr);
- task->performTask(context);
- };
</del><ins>+ typename CrossThreadCopier<P7>::Type, MP7, typename CrossThreadCopier<P8>::Type, MP8>::create(
+ method,
+ CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
+ CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4),
+ CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6),
+ CrossThreadCopier<P7>::copy(parameter7), CrossThreadCopier<P8>::copy(parameter8));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -4876,7 +4876,7 @@
</span><span class="cx"> void Document::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(source, level, message.isolatedCopy()));
</del><ins>+ postTask(AddConsoleMessageTask::create(source, level, message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4887,7 +4887,7 @@
</span><span class="cx"> void Document::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack> callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(source, level, message));
</del><ins>+ postTask(AddConsoleMessageTask::create(source, level, message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4900,32 +4900,51 @@
</span><span class="cx"> return topDocument().securityOrigin();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::postTask(Task task)
</del><ins>+struct PerformTaskContext {
+ WTF_MAKE_NONCOPYABLE(PerformTaskContext); WTF_MAKE_FAST_ALLOCATED;
+public:
+ PerformTaskContext(WeakPtr<Document> document, PassOwnPtr<ScriptExecutionContext::Task> task)
+ : documentReference(document)
+ , task(task)
+ {
+ }
+
+ WeakPtr<Document> documentReference;
+ OwnPtr<ScriptExecutionContext::Task> task;
+};
+
+void Document::didReceiveTask(void* untypedContext)
</ins><span class="cx"> {
</span><del>- Task* taskPtr = std::make_unique<Task>(std::move(task)).release();
- WeakPtr<Document> documentReference(m_weakFactory.createWeakPtr());
</del><ins>+ ASSERT(isMainThread());
</ins><span class="cx">
</span><del>- callOnMainThread([=] {
- ASSERT(isMainThread());
- std::unique_ptr<Task> task(taskPtr);
</del><ins>+ OwnPtr<PerformTaskContext> context = adoptPtr(static_cast<PerformTaskContext*>(untypedContext));
+ ASSERT(context);
</ins><span class="cx">
</span><del>- Document* document = documentReference.get();
- if (!document)
- return;
</del><ins>+ Document* document = context->documentReference.get();
+ if (!document)
+ return;
</ins><span class="cx">
</span><del>- Page* page = document->page();
- if ((page && page->defersLoading()) || !document->m_pendingTasks.isEmpty())
- document->m_pendingTasks.append(std::move(*task.release()));
- else
- task->performTask(document);
- });
</del><ins>+ Page* page = document->page();
+ if ((page && page->defersLoading()) || !document->m_pendingTasks.isEmpty()) {
+ document->m_pendingTasks.append(context->task.release());
+ return;
+ }
+
+ context->task->performTask(document);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void Document::postTask(PassOwnPtr<Task> task)
+{
+ callOnMainThread(didReceiveTask, new PerformTaskContext(m_weakFactory.createWeakPtr(), task));
+}
+
</ins><span class="cx"> void Document::pendingTasksTimerFired(Timer<Document>&)
</span><span class="cx"> {
</span><del>- Vector<Task> pendingTasks = std::move(m_pendingTasks);
- for (auto& task : pendingTasks)
- task.performTask(this);
</del><ins>+ while (!m_pendingTasks.isEmpty()) {
+ OwnPtr<Task> task = m_pendingTasks[0].release();
+ m_pendingTasks.remove(0);
+ task->performTask(this);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::suspendScheduledTasks(ActiveDOMObject::ReasonForSuspension reason)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/dom/Document.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -1007,7 +1007,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(PassOwnPtr<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 class="lines">@@ -1336,6 +1336,8 @@
</span><span class="cx">
</span><span class="cx"> void pendingTasksTimerFired(Timer<Document>&);
</span><span class="cx">
</span><ins>+ static void didReceiveTask(void*);
+
</ins><span class="cx"> template <typename CharacterType>
</span><span class="cx"> void displayBufferModifiedByEncodingInternal(CharacterType*, unsigned) const;
</span><span class="cx">
</span><span class="lines">@@ -1641,7 +1643,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Timer<Document> m_pendingTasksTimer;
</span><del>- Vector<Task> m_pendingTasks;
</del><ins>+ Vector<OwnPtr<Task>> m_pendingTasks;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -55,6 +55,19 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class ProcessMessagesSoonTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<ProcessMessagesSoonTask> create()
+ {
+ return adoptPtr(new ProcessMessagesSoonTask);
+ }
+
+ virtual void performTask(ScriptExecutionContext* context) override
+ {
+ context->dispatchMessagePortEvents();
+ }
+};
+
</ins><span class="cx"> class ScriptExecutionContext::PendingException {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(PendingException);
</span><span class="cx"> public:
</span><span class="lines">@@ -73,6 +86,11 @@
</span><span class="cx"> RefPtr<ScriptCallStack> m_callStack;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+void ScriptExecutionContext::AddConsoleMessageTask::performTask(ScriptExecutionContext* context)
+{
+ context->addConsoleMessage(m_source, m_level, m_message);
+}
+
</ins><span class="cx"> ScriptExecutionContext::ScriptExecutionContext()
</span><span class="cx"> : m_circularSequentialID(0)
</span><span class="cx"> , m_inDispatchErrorEvent(false)
</span><span class="lines">@@ -132,9 +150,7 @@
</span><span class="cx">
</span><span class="cx"> void ScriptExecutionContext::processMessagePortMessagesSoon()
</span><span class="cx"> {
</span><del>- postTask([] (ScriptExecutionContext* context) {
- context->dispatchMessagePortEvents();
- });
</del><ins>+ postTask(ProcessMessagesSoonTask::create());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScriptExecutionContext::dispatchMessagePortEvents()
</span><span class="lines">@@ -444,6 +460,10 @@
</span><span class="cx"> return Settings::defaultDOMTimerAlignmentInterval();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ScriptExecutionContext::Task::~Task()
+{
+}
+
</ins><span class="cx"> JSC::VM& ScriptExecutionContext::vm()
</span><span class="cx"> {
</span><span class="cx"> if (isDocument())
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -115,35 +115,17 @@
</span><span class="cx"> void deref() { derefScriptExecutionContext(); }
</span><span class="cx">
</span><span class="cx"> class Task {
</span><ins>+ WTF_MAKE_NONCOPYABLE(Task);
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- enum CleanupTaskTag { CleanupTask };
-
- 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>
- Task(T task)
- : m_task(std::move(task))
- , m_isCleanupTask(false)
- {
- }
-
- template<typename T, typename = typename std::enable_if<std::is_convertible<T, std::function<void (ScriptExecutionContext*)>>::value>::type>
- Task(CleanupTaskTag, T task)
- : m_task(std::move(task))
- , m_isCleanupTask(true)
- {
- }
-
- Task(Task&&) = default;
-
- void performTask(ScriptExecutionContext* context) { m_task(context); }
- bool isCleanupTask() const { return m_isCleanupTask; }
-
- protected:
- std::function<void (ScriptExecutionContext*)> m_task;
- bool m_isCleanupTask;
</del><ins>+ Task() { }
+ virtual ~Task();
+ virtual void performTask(ScriptExecutionContext*) = 0;
+ // Certain tasks get marked specially so that they aren't discarded, and are executed, when the context is shutting down its message queue.
+ virtual bool isCleanupTask() const { return false; }
</ins><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(PassOwnPtr<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 class="lines">@@ -175,12 +157,21 @@
</span><span class="cx"> protected:
</span><span class="cx"> class AddConsoleMessageTask : public Task {
</span><span class="cx"> public:
</span><ins>+ static PassOwnPtr<AddConsoleMessageTask> create(MessageSource source, MessageLevel level, const String& message)
+ {
+ return adoptPtr(new AddConsoleMessageTask(source, level, message));
+ }
+ virtual void performTask(ScriptExecutionContext*) override;
+ private:
</ins><span class="cx"> AddConsoleMessageTask(MessageSource source, MessageLevel level, const String& message)
</span><del>- : Task([=] (ScriptExecutionContext* context) {
- context->addConsoleMessage(source, level, message);
- })
</del><ins>+ : m_source(source)
+ , m_level(level)
+ , m_message(message.isolatedCopy())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><ins>+ MessageSource m_source;
+ MessageLevel m_level;
+ String m_message;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ActiveDOMObject::ReasonForSuspension reasonForSuspendingActiveDOMObjects() const { return m_reasonForSuspendingActiveDOMObjects; }
</span></span></pre></div>
<a id="trunkSourceWebCoredomStringCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StringCallback.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StringCallback.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/dom/StringCallback.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -36,12 +36,36 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+namespace {
+
+class DispatchCallbackTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<DispatchCallbackTask> create(PassRefPtr<StringCallback> callback, const String& data)
+ {
+ return adoptPtr(new DispatchCallbackTask(callback, data));
+ }
+
+ virtual void performTask(ScriptExecutionContext*) override
+ {
+ m_callback->handleEvent(m_data);
+ }
+
+private:
+ DispatchCallbackTask(PassRefPtr<StringCallback> callback, const String& data)
+ : m_callback(callback)
+ , m_data(data)
+ {
+ }
+
+ RefPtr<StringCallback> m_callback;
+ const String m_data;
+};
+
+} // namespace
+
</ins><span class="cx"> void StringCallback::scheduleCallback(ScriptExecutionContext* context, const String& data)
</span><span class="cx"> {
</span><del>- RefPtr<StringCallback> protector(this);
- context->postTask([=] (ScriptExecutionContext*) {
- this->handleEvent(data);
- });
</del><ins>+ context->postTask(DispatchCallbackTask::create(this, data));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -1100,6 +1100,41 @@
</span><span class="cx"> // The timer will delete itself once it fires.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class CallCacheListenerTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<CallCacheListenerTask> create(PassRefPtr<DocumentLoader> loader, ApplicationCacheHost::EventID eventID, int progressTotal, int progressDone)
+ {
+ return adoptPtr(new CallCacheListenerTask(loader, eventID, progressTotal, progressDone));
+ }
+
+ virtual void performTask(ScriptExecutionContext* context) override
+ {
+
+ ASSERT_UNUSED(context, context->isDocument());
+ Frame* frame = m_documentLoader->frame();
+ if (!frame)
+ return;
+
+ ASSERT(frame->loader().documentLoader() == m_documentLoader.get());
+
+ m_documentLoader->applicationCacheHost()->notifyDOMApplicationCache(m_eventID, m_progressTotal, m_progressDone);
+ }
+
+private:
+ CallCacheListenerTask(PassRefPtr<DocumentLoader> loader, ApplicationCacheHost::EventID eventID, int progressTotal, int progressDone)
+ : m_documentLoader(loader)
+ , m_eventID(eventID)
+ , m_progressTotal(progressTotal)
+ , m_progressDone(progressDone)
+ {
+ }
+
+ RefPtr<DocumentLoader> m_documentLoader;
+ ApplicationCacheHost::EventID m_eventID;
+ int m_progressTotal;
+ int m_progressDone;
+};
+
</ins><span class="cx"> void ApplicationCacheGroup::postListenerTask(ApplicationCacheHost::EventID eventID, int progressTotal, int progressDone, const HashSet<DocumentLoader*>& loaderSet)
</span><span class="cx"> {
</span><span class="cx"> HashSet<DocumentLoader*>::const_iterator loaderSetEnd = loaderSet.end();
</span><span class="lines">@@ -1115,17 +1150,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(frame->loader().documentLoader() == loader);
</span><span class="cx">
</span><del>- RefPtr<DocumentLoader> loaderProtector(loader);
- frame->document()->postTask([=] (ScriptExecutionContext* context) {
- ASSERT_UNUSED(context, context->isDocument());
- Frame* frame = loaderProtector->frame();
- if (!frame)
- return;
-
- ASSERT(frame->loader().documentLoader() == loaderProtector);
-
- loaderProtector->applicationCacheHost()->notifyDOMApplicationCache(eventID, progressTotal, progressDone);
- });
</del><ins>+ frame->document()->postTask(CallCacheListenerTask::create(loader, eventID, progressTotal, progressDone));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheGroup::setUpdateStatus(UpdateStatus status)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</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(PassOwnPtr<ScriptExecutionContext::Task>);
+ virtual bool postTaskForModeToWorkerGlobalScope(PassOwnPtr<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(PassOwnPtr<ScriptExecutionContext::Task> task)
</ins><span class="cx"> {
</span><span class="cx"> MutexLocker lock(m_workerDocumentsLock);
</span><span class="cx">
</span><span class="lines">@@ -153,15 +153,15 @@
</span><span class="cx"> // Just pick an arbitrary active document from the HashSet and pass load requests to it.
</span><span class="cx"> // FIXME: Do we need to deal with the case where the user closes the document mid-load, via a shadow document or some other solution?
</span><span class="cx"> Document* document = *(m_workerDocuments.begin());
</span><del>- document->postTask(std::move(task));
</del><ins>+ document->postTask(task);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool SharedWorkerProxy::postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task task, const String& mode)
</del><ins>+bool SharedWorkerProxy::postTaskForModeToWorkerGlobalScope(PassOwnPtr<ScriptExecutionContext::Task> task, const String& mode)
</ins><span class="cx"> {
</span><span class="cx"> if (isClosing())
</span><span class="cx"> return false;
</span><span class="cx"> ASSERT(m_thread);
</span><del>- m_thread->runLoop().postTaskForMode(std::move(task), mode);
</del><ins>+ m_thread->runLoop().postTaskForMode(task, mode);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -254,19 +254,30 @@
</span><span class="cx">
</span><span class="cx"> class SharedWorkerConnectTask : public ScriptExecutionContext::Task {
</span><span class="cx"> public:
</span><del>- SharedWorkerConnectTask(MessagePortChannel* channel)
- : ScriptExecutionContext::Task([=] (ScriptExecutionContext* context) {
- RefPtr<MessagePort> port = MessagePort::create(*context);
- port->entangle(std::unique_ptr<MessagePortChannel>(channel));
- ASSERT_WITH_SECURITY_IMPLICATION(context->isWorkerGlobalScope());
- WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
- // Since close() stops the thread event loop, this should not ever get called while closing.
- ASSERT(!workerGlobalScope->isClosing());
- ASSERT_WITH_SECURITY_IMPLICATION(workerGlobalScope->isSharedWorkerGlobalScope());
- workerGlobalScope->dispatchEvent(createConnectEvent(port));
- })
</del><ins>+ static PassOwnPtr<SharedWorkerConnectTask> create(std::unique_ptr<MessagePortChannel> channel)
</ins><span class="cx"> {
</span><ins>+ return adoptPtr(new SharedWorkerConnectTask(std::move(channel)));
</ins><span class="cx"> }
</span><ins>+
+private:
+ SharedWorkerConnectTask(std::unique_ptr<MessagePortChannel> channel)
+ : m_channel(std::move(channel))
+ {
+ }
+
+ virtual void performTask(ScriptExecutionContext* scriptContext)
+ {
+ RefPtr<MessagePort> port = MessagePort::create(*scriptContext);
+ port->entangle(std::move(m_channel));
+ ASSERT_WITH_SECURITY_IMPLICATION(scriptContext->isWorkerGlobalScope());
+ WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(scriptContext);
+ // Since close() stops the thread event loop, this should not ever get called while closing.
+ ASSERT(!workerGlobalScope->isClosing());
+ ASSERT_WITH_SECURITY_IMPLICATION(workerGlobalScope->isSharedWorkerGlobalScope());
+ workerGlobalScope->dispatchEvent(createConnectEvent(port));
+ }
+
+ std::unique_ptr<MessagePortChannel> m_channel;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Loads the script on behalf of a worker.
</span><span class="lines">@@ -356,8 +367,7 @@
</span><span class="cx"> proxy.setThread(thread);
</span><span class="cx"> thread->start();
</span><span class="cx"> }
</span><del>-
- proxy.thread()->runLoop().postTask(SharedWorkerConnectTask(port.release()));
</del><ins>+ proxy.thread()->runLoop().postTask(SharedWorkerConnectTask::create(std::move(port)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DefaultSharedWorkerRepository::hasSharedWorkers(Document* document)
</span><span class="lines">@@ -405,7 +415,7 @@
</span><span class="cx"> }
</span><span class="cx"> // If proxy is already running, just connect to it - otherwise, kick off a loader to load the script.
</span><span class="cx"> if (proxy->thread())
</span><del>- proxy->thread()->runLoop().postTask(SharedWorkerConnectTask(port.release()));
</del><ins>+ proxy->thread()->runLoop().postTask(SharedWorkerConnectTask::create(std::move(port)));
</ins><span class="cx"> else {
</span><span class="cx"> RefPtr<SharedWorkerScriptLoader> loader = adoptRef(new SharedWorkerScriptLoader(worker, std::move(port), proxy.release()));
</span><span class="cx"> loader->load(url);
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerEventQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerEventQueue.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerEventQueue.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/workers/WorkerEventQueue.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -46,28 +46,30 @@
</span><span class="cx"> close();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class WorkerEventQueue::EventDispatcher
-{
</del><ins>+class WorkerEventQueue::EventDispatcherTask final : public ScriptExecutionContext::Task {
</ins><span class="cx"> public:
</span><del>- EventDispatcher(PassRefPtr<Event> event, WorkerEventQueue& eventQueue)
- : m_event(event)
- , m_eventQueue(eventQueue)
- , m_isCancelled(false)
</del><ins>+ static PassOwnPtr<EventDispatcherTask> create(PassRefPtr<Event> event, WorkerEventQueue& eventQueue)
</ins><span class="cx"> {
</span><ins>+ return adoptPtr(new EventDispatcherTask(event, eventQueue));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- ~EventDispatcher()
</del><ins>+ virtual ~EventDispatcherTask()
</ins><span class="cx"> {
</span><span class="cx"> if (m_event)
</span><del>- m_eventQueue.m_eventDispatcherMap.remove(m_event.get());
</del><ins>+ m_eventQueue.m_eventTaskMap.remove(m_event.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void dispatch()
</del><ins>+ void dispatchEvent(ScriptExecutionContext*, PassRefPtr<Event> event)
</ins><span class="cx"> {
</span><ins>+ event->target()->dispatchEvent(event);
+ }
+
+ virtual void performTask(ScriptExecutionContext* context) override
+ {
</ins><span class="cx"> if (m_isCancelled)
</span><span class="cx"> return;
</span><del>- m_eventQueue.m_eventDispatcherMap.remove(m_event.get());
- m_event->target()->dispatchEvent(m_event);
</del><ins>+ m_eventQueue.m_eventTaskMap.remove(m_event.get());
+ dispatchEvent(context, m_event);
</ins><span class="cx"> m_event.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -78,29 +80,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ EventDispatcherTask(PassRefPtr<Event> event, WorkerEventQueue& eventQueue)
+ : m_event(event)
+ , m_eventQueue(eventQueue)
+ , m_isCancelled(false)
+ {
+ }
+
</ins><span class="cx"> RefPtr<Event> m_event;
</span><span class="cx"> WorkerEventQueue& m_eventQueue;
</span><span class="cx"> bool m_isCancelled;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-bool WorkerEventQueue::enqueueEvent(PassRefPtr<Event> event)
</del><ins>+bool WorkerEventQueue::enqueueEvent(PassRefPtr<Event> prpEvent)
</ins><span class="cx"> {
</span><span class="cx"> if (m_isClosed)
</span><span class="cx"> return false;
</span><del>-
- EventDispatcher* eventDispatcherPtr = new EventDispatcher(event.get(), *this);
- m_eventDispatcherMap.add(event, eventDispatcherPtr);
- m_scriptExecutionContext.postTask([=] (ScriptExecutionContext*) {
- std::unique_ptr<EventDispatcher> eventDispatcher(eventDispatcherPtr);
- eventDispatcher->dispatch();
- });
-
</del><ins>+ RefPtr<Event> event = prpEvent;
+ OwnPtr<EventDispatcherTask> task = EventDispatcherTask::create(event, *this);
+ m_eventTaskMap.add(event.release(), task.get());
+ m_scriptExecutionContext.postTask(task.release());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WorkerEventQueue::cancelEvent(Event& event)
</span><span class="cx"> {
</span><del>- EventDispatcher* task = m_eventDispatcherMap.take(&event);
</del><ins>+ EventDispatcherTask* task = m_eventTaskMap.take(&event);
</ins><span class="cx"> if (!task)
</span><span class="cx"> return false;
</span><span class="cx"> task->cancel();
</span><span class="lines">@@ -110,9 +115,11 @@
</span><span class="cx"> void WorkerEventQueue::close()
</span><span class="cx"> {
</span><span class="cx"> m_isClosed = true;
</span><del>- for (auto& dispatcher : m_eventDispatcherMap.values())
- dispatcher->cancel();
- m_eventDispatcherMap.clear();
</del><ins>+ for (EventTaskMap::iterator it = m_eventTaskMap.begin(); it != m_eventTaskMap.end(); ++it) {
+ EventDispatcherTask* task = it->value;
+ task->cancel();
+ }
+ m_eventTaskMap.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerEventQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerEventQueue.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerEventQueue.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/workers/WorkerEventQueue.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -48,9 +48,9 @@
</span><span class="cx"> ScriptExecutionContext& m_scriptExecutionContext;
</span><span class="cx"> bool m_isClosed;
</span><span class="cx">
</span><del>- class EventDispatcher;
- typedef HashMap<RefPtr<Event>, EventDispatcher*> EventDispatcherMap;
- EventDispatcherMap m_eventDispatcherMap;
</del><ins>+ class EventDispatcherTask;
+ typedef HashMap<RefPtr<Event>, EventDispatcherTask*> EventTaskMap;
+ EventTaskMap m_eventTaskMap;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -64,6 +64,22 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class CloseWorkerGlobalScopeTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<CloseWorkerGlobalScopeTask> create()
+ {
+ return adoptPtr(new CloseWorkerGlobalScopeTask);
+ }
+
+ virtual void performTask(ScriptExecutionContext *context)
+ {
+ // Notify parent that this context is closed. Parent is responsible for calling WorkerThread::stop().
+ toWorkerGlobalScope(context)->thread().workerReportingProxy().workerGlobalScopeClosed();
+ }
+
+ virtual bool isCleanupTask() const { return true; }
+};
+
</ins><span class="cx"> WorkerGlobalScope::WorkerGlobalScope(const URL& url, const String& userAgent, std::unique_ptr<GroupSettings> settings, WorkerThread& thread, PassRefPtr<SecurityOrigin> topOrigin)
</span><span class="cx"> : m_url(url)
</span><span class="cx"> , m_userAgent(userAgent)
</span><span class="lines">@@ -133,12 +149,7 @@
</span><span class="cx"> // After m_closing is set, all the tasks in the queue continue to be fetched but only
</span><span class="cx"> // tasks with isCleanupTask()==true will be executed.
</span><span class="cx"> m_closing = true;
</span><del>- postTask({ ScriptExecutionContext::Task::CleanupTask, [] (ScriptExecutionContext* context) {
- ASSERT_WITH_SECURITY_IMPLICATION(context->isWorkerGlobalScope());
- WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
- // Notify parent that this context is closed. Parent is responsible for calling WorkerThread::stop().
- workerGlobalScope->thread().workerReportingProxy().workerGlobalScopeClosed();
- } });
</del><ins>+ postTask(CloseWorkerGlobalScopeTask::create());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WorkerNavigator* WorkerGlobalScope::navigator() const
</span><span class="lines">@@ -148,9 +159,9 @@
</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(PassOwnPtr<Task> task)
</ins><span class="cx"> {
</span><del>- thread().runLoop().postTask(std::move(task));
</del><ins>+ thread().runLoop().postTask(task);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int WorkerGlobalScope::setTimeout(PassOwnPtr<ScheduledAction> action, int timeout)
</span><span class="lines">@@ -223,7 +234,7 @@
</span><span class="cx"> void WorkerGlobalScope::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(source, level, message));
</del><ins>+ postTask(AddConsoleMessageTask::create(source, level, message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -234,7 +245,7 @@
</span><span class="cx"> void WorkerGlobalScope::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(source, level, message));
</del><ins>+ postTask(AddConsoleMessageTask::create(source, level, message));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h 2014-04-28 20:55:09 UTC (rev 167904)
</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(PassOwnPtr<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 (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerLoaderProxy.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/workers/WorkerLoaderProxy.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -47,12 +47,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(PassOwnPtr<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(PassOwnPtr<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 (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -53,6 +53,219 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class MessageWorkerGlobalScopeTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<MessageWorkerGlobalScopeTask> create(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels)
+ {
+ return adoptPtr(new MessageWorkerGlobalScopeTask(message, std::move(channels)));
+ }
+
+private:
+ MessageWorkerGlobalScopeTask(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels)
+ : m_message(message)
+ , m_channels(std::move(channels))
+ {
+ }
+
+ virtual void performTask(ScriptExecutionContext* scriptContext)
+ {
+ ASSERT_WITH_SECURITY_IMPLICATION(scriptContext->isWorkerGlobalScope());
+ DedicatedWorkerGlobalScope* context = static_cast<DedicatedWorkerGlobalScope*>(scriptContext);
+ std::unique_ptr<MessagePortArray> ports = MessagePort::entanglePorts(*scriptContext, std::move(m_channels));
+ context->dispatchEvent(MessageEvent::create(std::move(ports), m_message));
+ context->thread().workerObjectProxy().confirmMessageFromWorkerObject(context->hasPendingActivity());
+ }
+
+private:
+ RefPtr<SerializedScriptValue> m_message;
+ std::unique_ptr<MessagePortChannelArray> m_channels;
+};
+
+class MessageWorkerTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<MessageWorkerTask> create(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels, WorkerMessagingProxy* messagingProxy)
+ {
+ return adoptPtr(new MessageWorkerTask(message, std::move(channels), messagingProxy));
+ }
+
+private:
+ MessageWorkerTask(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels, WorkerMessagingProxy* messagingProxy)
+ : m_message(message)
+ , m_channels(std::move(channels))
+ , m_messagingProxy(messagingProxy)
+ {
+ }
+
+ virtual void performTask(ScriptExecutionContext* scriptContext)
+ {
+ Worker* workerObject = m_messagingProxy->workerObject();
+ if (!workerObject || m_messagingProxy->askedToTerminate())
+ return;
+
+ std::unique_ptr<MessagePortArray> ports = MessagePort::entanglePorts(*scriptContext, std::move(m_channels));
+ workerObject->dispatchEvent(MessageEvent::create(std::move(ports), m_message));
+ }
+
+private:
+ RefPtr<SerializedScriptValue> m_message;
+ std::unique_ptr<MessagePortChannelArray> m_channels;
+ WorkerMessagingProxy* m_messagingProxy;
+};
+
+class WorkerExceptionTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<WorkerExceptionTask> create(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, WorkerMessagingProxy* messagingProxy)
+ {
+ return adoptPtr(new WorkerExceptionTask(errorMessage, lineNumber, columnNumber, sourceURL, messagingProxy));
+ }
+
+private:
+ WorkerExceptionTask(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, WorkerMessagingProxy* messagingProxy)
+ : m_errorMessage(errorMessage.isolatedCopy())
+ , m_lineNumber(lineNumber)
+ , m_columnNumber(columnNumber)
+ , m_sourceURL(sourceURL.isolatedCopy())
+ , m_messagingProxy(messagingProxy)
+ {
+ }
+
+ virtual void performTask(ScriptExecutionContext* context)
+ {
+ Worker* workerObject = m_messagingProxy->workerObject();
+ if (!workerObject)
+ return;
+
+ // We don't bother checking the askedToTerminate() flag here, because exceptions should *always* be reported even if the thread is terminated.
+ // This is intentionally different than the behavior in MessageWorkerTask, because terminated workers no longer deliver messages (section 4.6 of the WebWorker spec), but they do report exceptions.
+
+ bool errorHandled = !workerObject->dispatchEvent(ErrorEvent::create(m_errorMessage, m_sourceURL, m_lineNumber, m_columnNumber));
+ if (!errorHandled)
+ context->reportException(m_errorMessage, m_lineNumber, m_columnNumber, m_sourceURL, 0);
+ }
+
+ String m_errorMessage;
+ int m_lineNumber;
+ int m_columnNumber;
+ String m_sourceURL;
+ WorkerMessagingProxy* m_messagingProxy;
+};
+
+class WorkerGlobalScopeDestroyedTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<WorkerGlobalScopeDestroyedTask> create(WorkerMessagingProxy* messagingProxy)
+ {
+ return adoptPtr(new WorkerGlobalScopeDestroyedTask(messagingProxy));
+ }
+
+private:
+ WorkerGlobalScopeDestroyedTask(WorkerMessagingProxy* messagingProxy)
+ : m_messagingProxy(messagingProxy)
+ {
+ }
+
+ virtual void performTask(ScriptExecutionContext*)
+ {
+ m_messagingProxy->workerGlobalScopeDestroyedInternal();
+ }
+
+ WorkerMessagingProxy* m_messagingProxy;
+};
+
+class WorkerTerminateTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<WorkerTerminateTask> create(WorkerMessagingProxy* messagingProxy)
+ {
+ return adoptPtr(new WorkerTerminateTask(messagingProxy));
+ }
+
+private:
+ WorkerTerminateTask(WorkerMessagingProxy* messagingProxy)
+ : m_messagingProxy(messagingProxy)
+ {
+ }
+
+ virtual void performTask(ScriptExecutionContext*)
+ {
+ m_messagingProxy->terminateWorkerGlobalScope();
+ }
+
+ WorkerMessagingProxy* m_messagingProxy;
+};
+
+class WorkerThreadActivityReportTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<WorkerThreadActivityReportTask> create(WorkerMessagingProxy* messagingProxy, bool confirmingMessage, bool hasPendingActivity)
+ {
+ return adoptPtr(new WorkerThreadActivityReportTask(messagingProxy, confirmingMessage, hasPendingActivity));
+ }
+
+private:
+ WorkerThreadActivityReportTask(WorkerMessagingProxy* messagingProxy, bool confirmingMessage, bool hasPendingActivity)
+ : m_messagingProxy(messagingProxy)
+ , m_confirmingMessage(confirmingMessage)
+ , m_hasPendingActivity(hasPendingActivity)
+ {
+ }
+
+ virtual void performTask(ScriptExecutionContext*)
+ {
+ m_messagingProxy->reportPendingActivityInternal(m_confirmingMessage, m_hasPendingActivity);
+ }
+
+ WorkerMessagingProxy* m_messagingProxy;
+ bool m_confirmingMessage;
+ bool m_hasPendingActivity;
+};
+
+class PostMessageToPageInspectorTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<PostMessageToPageInspectorTask> create(WorkerMessagingProxy* messagingProxy, const String& message)
+ {
+ return adoptPtr(new PostMessageToPageInspectorTask(messagingProxy, message));
+ }
+
+private:
+ PostMessageToPageInspectorTask(WorkerMessagingProxy* messagingProxy, const String& message)
+ : m_messagingProxy(messagingProxy)
+ , m_message(message.isolatedCopy())
+ {
+ }
+
+ virtual void performTask(ScriptExecutionContext*)
+ {
+#if ENABLE(INSPECTOR)
+ if (WorkerGlobalScopeProxy::PageInspector* pageInspector = m_messagingProxy->m_pageInspector)
+ pageInspector->dispatchMessageFromWorker(m_message);
+#endif
+ }
+
+ WorkerMessagingProxy* m_messagingProxy;
+ String m_message;
+};
+
+class NotifyNetworkStateChangeTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<NotifyNetworkStateChangeTask> create(bool isOnLine)
+ {
+ return adoptPtr(new NotifyNetworkStateChangeTask(isOnLine));
+ }
+
+private:
+ NotifyNetworkStateChangeTask(bool isOnLine)
+ : m_isOnLine(isOnLine)
+ {
+ }
+
+ virtual void performTask(ScriptExecutionContext *context)
+ {
+ AtomicString eventName = m_isOnLine ? eventNames().onlineEvent : eventNames().offlineEvent;
+ toWorkerGlobalScope(context)->dispatchEvent(Event::create(eventName, false, false));
+ }
+
+ bool m_isOnLine;
+};
+
+
</ins><span class="cx"> WorkerGlobalScopeProxy* WorkerGlobalScopeProxy::create(Worker* worker)
</span><span class="cx"> {
</span><span class="cx"> return new WorkerMessagingProxy(worker);
</span><span class="lines">@@ -97,15 +310,7 @@
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::postMessageToWorkerObject(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels)
</span><span class="cx"> {
</span><del>- MessagePortChannelArray* channelsPtr = channels.release();
- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext* context) {
- Worker* workerObject = this->workerObject();
- if (!workerObject || this->askedToTerminate())
- return;
-
- std::unique_ptr<MessagePortArray> ports = MessagePort::entanglePorts(*context, std::unique_ptr<MessagePortChannelArray>(channelsPtr));
- workerObject->dispatchEvent(MessageEvent::create(std::move(ports), message));
- });
</del><ins>+ m_scriptExecutionContext->postTask(MessageWorkerTask::create(message, std::move(channels), this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels)
</span><span class="lines">@@ -113,55 +318,33 @@
</span><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- MessagePortChannelArray* channelsPtr = channels.release();
- ScriptExecutionContext::Task task([=] (ScriptExecutionContext* scriptContext) {
- ASSERT_WITH_SECURITY_IMPLICATION(scriptContext->isWorkerGlobalScope());
- DedicatedWorkerGlobalScope* context = static_cast<DedicatedWorkerGlobalScope*>(scriptContext);
- std::unique_ptr<MessagePortArray> ports = MessagePort::entanglePorts(*scriptContext, std::unique_ptr<MessagePortChannelArray>(channelsPtr));
- context->dispatchEvent(MessageEvent::create(std::move(ports), message));
- context->thread().workerObjectProxy().confirmMessageFromWorkerObject(context->hasPendingActivity());
- });
-
</del><span class="cx"> if (m_workerThread) {
</span><span class="cx"> ++m_unconfirmedMessageCount;
</span><del>- m_workerThread->runLoop().postTask(std::move(task));
</del><ins>+ m_workerThread->runLoop().postTask(MessageWorkerGlobalScopeTask::create(message, std::move(channels)));
</ins><span class="cx"> } else
</span><del>- m_queuedEarlyTasks.append(std::make_unique<ScriptExecutionContext::Task>(std::move(task)));
</del><ins>+ m_queuedEarlyTasks.append(MessageWorkerGlobalScopeTask::create(message, std::move(channels)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool WorkerMessagingProxy::postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task task, const String& mode)
</del><ins>+bool WorkerMessagingProxy::postTaskForModeToWorkerGlobalScope(PassOwnPtr<ScriptExecutionContext::Task> task, const String& mode)
</ins><span class="cx"> {
</span><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> ASSERT(m_workerThread);
</span><del>- m_workerThread->runLoop().postTaskForMode(std::move(task), mode);
</del><ins>+ m_workerThread->runLoop().postTaskForMode(task, mode);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerMessagingProxy::postTaskToLoader(ScriptExecutionContext::Task task)
</del><ins>+void WorkerMessagingProxy::postTaskToLoader(PassOwnPtr<ScriptExecutionContext::Task> task)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: In case of nested workers, this should go directly to the root Document context.
</span><span class="cx"> ASSERT(m_scriptExecutionContext->isDocument());
</span><del>- m_scriptExecutionContext->postTask(std::move(task));
</del><ins>+ m_scriptExecutionContext->postTask(task);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><del>- String errorMessageCopy = errorMessage.isolatedCopy();
- String sourceURLCopy = sourceURL.isolatedCopy();
- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext* context) {
- Worker* workerObject = this->workerObject();
- if (!workerObject)
- return;
-
- // We don't bother checking the askedToTerminate() flag here, because exceptions should *always* be reported even if the thread is terminated.
- // This is intentionally different than the behavior in MessageWorkerTask, because terminated workers no longer deliver messages (section 4.6 of the WebWorker spec), but they do report exceptions.
-
- bool errorHandled = !workerObject->dispatchEvent(ErrorEvent::create(errorMessageCopy, sourceURLCopy, lineNumber, columnNumber));
- if (!errorHandled)
- context->reportException(errorMessageCopy, lineNumber, columnNumber, sourceURLCopy, 0);
- });
</del><ins>+ m_scriptExecutionContext->postTask(WorkerExceptionTask::create(errorMessage, lineNumber, columnNumber, sourceURL, this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void postConsoleMessageTask(ScriptExecutionContext* context, WorkerMessagingProxy* messagingProxy, MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceURL)
</span><span class="lines">@@ -184,13 +367,14 @@
</span><span class="cx"> // Worker.terminate() could be called from JS before the thread was created.
</span><span class="cx"> m_workerThread->stop();
</span><span class="cx"> } else {
</span><ins>+ unsigned taskCount = m_queuedEarlyTasks.size();
</ins><span class="cx"> ASSERT(!m_unconfirmedMessageCount);
</span><del>- m_unconfirmedMessageCount = m_queuedEarlyTasks.size();
</del><ins>+ m_unconfirmedMessageCount = taskCount;
</ins><span class="cx"> m_workerThreadHadPendingActivity = true; // Worker initialization means a pending activity.
</span><span class="cx">
</span><del>- auto queuedEarlyTasks = std::move(m_queuedEarlyTasks);
- for (auto& task : queuedEarlyTasks)
- m_workerThread->runLoop().postTask(std::move(*task));
</del><ins>+ for (unsigned i = 0; i < taskCount; ++i)
+ m_workerThread->runLoop().postTask(m_queuedEarlyTasks[i].release());
+ m_queuedEarlyTasks.clear();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -208,10 +392,7 @@
</span><span class="cx"> if (!m_workerThread)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_workerThread->runLoop().postTask([=] (ScriptExecutionContext* context) {
- WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
- workerGlobalScope->dispatchEvent(Event::create(isOnline ? eventNames().onlineEvent : eventNames().offlineEvent, false, false));
- });
</del><ins>+ m_workerThread->runLoop().postTask(NotifyNetworkStateChangeTask::create(isOnline));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::workerObjectDestroyedInternal(ScriptExecutionContext*, WorkerMessagingProxy* proxy)
</span><span class="lines">@@ -267,18 +448,14 @@
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::workerGlobalScopeDestroyed()
</span><span class="cx"> {
</span><del>- m_scriptExecutionContext->postTask([this] (ScriptExecutionContext*) {
- workerGlobalScopeDestroyedInternal();
- });
</del><ins>+ m_scriptExecutionContext->postTask(WorkerGlobalScopeDestroyedTask::create(this));
</ins><span class="cx"> // Will execute workerGlobalScopeDestroyedInternal() on context's thread.
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::workerGlobalScopeClosed()
</span><span class="cx"> {
</span><span class="cx"> // Executes terminateWorkerGlobalScope() on parent context's thread.
</span><del>- m_scriptExecutionContext->postTask([this] (ScriptExecutionContext*) {
- terminateWorkerGlobalScope();
- });
</del><ins>+ m_scriptExecutionContext->postTask(WorkerTerminateTask::create(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::workerGlobalScopeDestroyedInternal()
</span><span class="lines">@@ -309,26 +486,19 @@
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> void WorkerMessagingProxy::postMessageToPageInspector(const String& message)
</span><span class="cx"> {
</span><del>- String messageCopy = message.isolatedCopy();
- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext*) {
- this->m_pageInspector->dispatchMessageFromWorker(messageCopy);
- });
</del><ins>+ m_scriptExecutionContext->postTask(PostMessageToPageInspectorTask::create(this, message));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::confirmMessageFromWorkerObject(bool hasPendingActivity)
</span><span class="cx"> {
</span><del>- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext*) {
- this->reportPendingActivityInternal(true, hasPendingActivity);
- });
</del><ins>+ m_scriptExecutionContext->postTask(WorkerThreadActivityReportTask::create(this, true, hasPendingActivity));
</ins><span class="cx"> // Will execute reportPendingActivityInternal() on context's thread.
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::reportPendingActivity(bool hasPendingActivity)
</span><span class="cx"> {
</span><del>- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext*) {
- this->reportPendingActivityInternal(false, hasPendingActivity);
- });
</del><ins>+ m_scriptExecutionContext->postTask(WorkerThreadActivityReportTask::create(this, false, hasPendingActivity));
</ins><span class="cx"> // Will execute reportPendingActivityInternal() on context's thread.
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -80,8 +80,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(PassOwnPtr<ScriptExecutionContext::Task>) override;
+ virtual bool postTaskForModeToWorkerGlobalScope(PassOwnPtr<ScriptExecutionContext::Task>, const String& mode) override;
</ins><span class="cx">
</span><span class="cx"> void workerThreadCreated(PassRefPtr<DedicatedWorkerThread>);
</span><span class="cx">
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_askedToTerminate;
</span><span class="cx">
</span><del>- Vector<std::unique_ptr<ScriptExecutionContext::Task>> m_queuedEarlyTasks; // Tasks are queued here until there's a thread object created.
</del><ins>+ Vector<OwnPtr<ScriptExecutionContext::Task>> m_queuedEarlyTasks; // Tasks are queued here until there's a thread object created.
</ins><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> WorkerGlobalScopeProxy::PageInspector* m_pageInspector;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerRunLoopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerRunLoop.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerRunLoop.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/workers/WorkerRunLoop.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -192,34 +192,34 @@
</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(PassOwnPtr<ScriptExecutionContext::Task> task)
</ins><span class="cx"> {
</span><del>- postTaskForMode(std::move(task), defaultMode());
</del><ins>+ postTaskForMode(task, defaultMode());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerRunLoop::postTaskAndTerminate(ScriptExecutionContext::Task task)
</del><ins>+void WorkerRunLoop::postTaskAndTerminate(PassOwnPtr<ScriptExecutionContext::Task> task)
</ins><span class="cx"> {
</span><del>- m_messageQueue.appendAndKill(Task::create(std::move(task), defaultMode().isolatedCopy()));
</del><ins>+ m_messageQueue.appendAndKill(Task::create(task, defaultMode().isolatedCopy()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerRunLoop::postTaskForMode(ScriptExecutionContext::Task task, const String& mode)
</del><ins>+void WorkerRunLoop::postTaskForMode(PassOwnPtr<ScriptExecutionContext::Task> task, const String& mode)
</ins><span class="cx"> {
</span><del>- m_messageQueue.append(Task::create(std::move(task), mode.isolatedCopy()));
</del><ins>+ m_messageQueue.append(Task::create(task, mode.isolatedCopy()));
</ins><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(PassOwnPtr<ScriptExecutionContext::Task> task, const String& mode)
</ins><span class="cx"> {
</span><del>- return std::unique_ptr<Task>(new Task(std::move(task), mode));
</del><ins>+ return std::unique_ptr<Task>(new Task(task, mode));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerRunLoop::Task::performTask(const WorkerRunLoop& runLoop, ScriptExecutionContext* context)
</span><span class="cx"> {
</span><del>- if ((!toWorkerGlobalScope(context)->isClosing() && !runLoop.terminated()) || m_task.isCleanupTask())
- m_task.performTask(context);
</del><ins>+ if ((!toWorkerGlobalScope(context)->isClosing() && !runLoop.terminated()) || m_task->isCleanupTask())
+ m_task->performTask(context);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WorkerRunLoop::Task::Task(ScriptExecutionContext::Task task, const String& mode)
- : m_task(std::move(task))
</del><ins>+WorkerRunLoop::Task::Task(PassOwnPtr<ScriptExecutionContext::Task> task, const String& mode)
+ : m_task(task)
</ins><span class="cx"> , m_mode(mode.isolatedCopy())
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerRunLoop.h (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerRunLoop.h 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/workers/WorkerRunLoop.h 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -58,9 +58,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(PassOwnPtr<ScriptExecutionContext::Task>);
+ void postTaskAndTerminate(PassOwnPtr<ScriptExecutionContext::Task>);
+ void postTaskForMode(PassOwnPtr<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">@@ -69,15 +69,15 @@
</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(PassOwnPtr<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&, ScriptExecutionContext*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Task(ScriptExecutionContext::Task task, const String& mode);
</del><ins>+ Task(PassOwnPtr<ScriptExecutionContext::Task> task, const String& mode);
</ins><span class="cx">
</span><del>- ScriptExecutionContext::Task m_task;
</del><ins>+ OwnPtr<ScriptExecutionContext::Task> m_task;
</ins><span class="cx"> String m_mode;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (167903 => 167904)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.cpp 2014-04-28 20:50:47 UTC (rev 167903)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2014-04-28 20:55:09 UTC (rev 167904)
</span><span class="lines">@@ -205,63 +205,89 @@
</span><span class="cx"> m_runLoop.run(m_workerGlobalScope.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThread::stop()
-{
- // Mutex protection is necessary because stop() can be called before the context is fully created.
- MutexLocker lock(m_threadCreationMutex);
</del><ins>+class WorkerThreadShutdownFinishTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<WorkerThreadShutdownFinishTask> create()
+ {
+ return adoptPtr(new WorkerThreadShutdownFinishTask());
+ }
</ins><span class="cx">
</span><del>- // Ensure that tasks are being handled by thread event loop. If script execution weren't forbidden, a while(1) loop in JS could keep the thread alive forever.
- if (m_workerGlobalScope) {
- m_workerGlobalScope->script()->scheduleExecutionTermination();
</del><ins>+ virtual void performTask(ScriptExecutionContext *context)
+ {
+ // It's not safe to call clearScript until all the cleanup tasks posted by functions initiated by WorkerThreadShutdownStartTask have completed.
+ toWorkerGlobalScope(context)->clearScript();
+ }
</ins><span class="cx">
</span><ins>+ virtual bool isCleanupTask() const { return true; }
+};
+
+class WorkerThreadShutdownStartTask : public ScriptExecutionContext::Task {
+public:
+ static PassOwnPtr<WorkerThreadShutdownStartTask> create()
+ {
+ return adoptPtr(new WorkerThreadShutdownStartTask());
+ }
+
+ virtual void performTask(ScriptExecutionContext *context)
+ {
+ WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
+
</ins><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- DatabaseManager::manager().interruptAllDatabasesForContext(m_workerGlobalScope.get());
</del><ins>+ // FIXME: Should we stop the databases as part of stopActiveDOMObjects() below?
+ DatabaseTaskSynchronizer cleanupSync;
+ DatabaseManager::manager().stopDatabases(workerGlobalScope, &cleanupSync);
</ins><span class="cx"> #endif
</span><del>- m_runLoop.postTaskAndTerminate({ ScriptExecutionContext::Task::CleanupTask, [] (ScriptExecutionContext* context ) {
- WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
</del><span class="cx">
</span><ins>+ workerGlobalScope->stopActiveDOMObjects();
+
+ workerGlobalScope->notifyObserversOfStop();
+
+ // Event listeners would keep DOMWrapperWorld objects alive for too long. Also, they have references to JS objects,
+ // which become dangling once Heap is destroyed.
+ workerGlobalScope->removeAllEventListeners();
+
</ins><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- // FIXME: Should we stop the databases as part of stopActiveDOMObjects() below?
- DatabaseTaskSynchronizer cleanupSync;
- DatabaseManager::manager().stopDatabases(workerGlobalScope, &cleanupSync);
</del><ins>+ // We wait for the database thread to clean up all its stuff so that we
+ // can do more stringent leak checks as we exit.
+ cleanupSync.waitForTaskCompletion();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- workerGlobalScope->stopActiveDOMObjects();
</del><ins>+ // Stick a shutdown command at the end of the queue, so that we deal
+ // with all the cleanup tasks the databases post first.
+ workerGlobalScope->postTask(WorkerThreadShutdownFinishTask::create());
+ }
</ins><span class="cx">
</span><del>- workerGlobalScope->notifyObserversOfStop();
</del><ins>+ virtual bool isCleanupTask() const { return true; }
+};
</ins><span class="cx">
</span><del>- // Event listeners would keep DOMWrapperWorld objects alive for too long. Also, they have references to JS objects,
- // which become dangling once Heap is destroyed.
- workerGlobalScope->removeAllEventListeners();
</del><ins>+void WorkerThread::stop()
+{
+ // Mutex protection is necessary because stop() can be called before the context is fully created.
+ MutexLocker lock(m_threadCreationMutex);
</ins><span class="cx">
</span><ins>+ // Ensure that tasks are being handled by thread event loop. If script execution weren't forbidden, a while(1) loop in JS could keep the thread alive forever.
+ if (m_workerGlobalScope) {
+ m_workerGlobalScope->script()->scheduleExecutionTermination();
+
</ins><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- // We wait for the database thread to clean up all its stuff so that we
- // can do more stringent leak checks as we exit.
- cleanupSync.waitForTaskCompletion();
</del><ins>+ DatabaseManager::manager().interruptAllDatabasesForContext(m_workerGlobalScope.get());
</ins><span class="cx"> #endif
</span><del>-
- // Stick a shutdown command at the end of the queue, so that we deal
- // with all the cleanup tasks the databases post first.
- workerGlobalScope->postTask({ ScriptExecutionContext::Task::CleanupTask, [] (ScriptExecutionContext* context) {
- WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
- // It's not safe to call clearScript until all the cleanup tasks posted by functions initiated by WorkerThreadShutdownStartTask have completed.
- workerGlobalScope->clearScript();
- } });
-
- } });
</del><ins>+ m_runLoop.postTaskAndTerminate(WorkerThreadShutdownStartTask::create());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> m_runLoop.terminate();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class ReleaseFastMallocFreeMemoryTask : public ScriptExecutionContext::Task {
+ virtual void performTask(ScriptExecutionContext*) override { WTF::releaseFastMallocFreeMemory(); }
+};
+
</ins><span class="cx"> void WorkerThread::releaseFastMallocFreeMemoryInAllThreads()
</span><span class="cx"> {
</span><span class="cx"> std::lock_guard<std::mutex> lock(threadSetMutex());
</span><span class="cx">
</span><span class="cx"> for (auto* workerThread : workerThreads())
</span><del>- workerThread->runLoop().postTask([] (ScriptExecutionContext*) {
- WTF::releaseFastMallocFreeMemory();
- });
</del><ins>+ workerThread->runLoop().postTask(adoptPtr(new ReleaseFastMallocFreeMemoryTask));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>