<!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>[170013] 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/170013">170013</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-06-16 09:45:59 -0700 (Mon, 16 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have ScriptExecutionContext::Task functions take in a ScriptExecutionContext reference
https://bugs.webkit.org/show_bug.cgi?id=133795
Reviewed by Andreas Kling.
The pointer to the ScriptExecutionContext object that is passed to the C++11 lambdas or
helper functions wrapped in ScriptExecutionContext::Task is never null, so that parameter
should be a reference instead.
* Modules/webdatabase/Database.cpp:
(WebCore::Database::~Database):
(WebCore::Database::runTransaction):
(WebCore::Database::scheduleTransactionCallback):
* Modules/webdatabase/DatabaseManager.cpp:
(WebCore::DatabaseManager::openDatabase):
* Modules/webdatabase/SQLCallbackWrapper.h:
(WebCore::SQLCallbackWrapper::clear):
* Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
(WebCore::ThreadableWebSocketChannelClientWrapper::processPendingTasksCallback):
(WebCore::ThreadableWebSocketChannelClientWrapper::processPendingTasks): Dereference the
member variable that holds a never-null pointer to the ScriptExecutionContext. This should
similarly be a reference.
(WebCore::ThreadableWebSocketChannelClientWrapper::didConnectCallback):
(WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback):
(WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveBinaryDataCallback):
(WebCore::ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmountCallback):
(WebCore::ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback):
(WebCore::ThreadableWebSocketChannelClientWrapper::didCloseCallback):
(WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageErrorCallback):
* Modules/websockets/ThreadableWebSocketChannelClientWrapper.h:
* Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
(WebCore::workerGlobalScopeDidSend):
(WebCore::workerGlobalScopeDidGetBufferedAmount):
(WebCore::workerGlobalScopeDidConnect):
(WebCore::workerGlobalScopeDidReceiveMessage):
(WebCore::workerGlobalScopeDidReceiveBinaryData):
(WebCore::workerGlobalScopeDidUpdateBufferedAmount):
(WebCore::workerGlobalScopeDidStartClosingHandshake):
(WebCore::workerGlobalScopeDidClose):
(WebCore::workerGlobalScopeDidReceiveMessageError):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::mainThreadInitialize):
(WebCore::WorkerThreadableWebSocketChannel::mainThreadConnect):
(WebCore::WorkerThreadableWebSocketChannel::mainThreadSend):
(WebCore::WorkerThreadableWebSocketChannel::mainThreadSendArrayBuffer):
(WebCore::WorkerThreadableWebSocketChannel::mainThreadSendBlob):
(WebCore::WorkerThreadableWebSocketChannel::mainThreadBufferedAmount):
(WebCore::WorkerThreadableWebSocketChannel::mainThreadClose):
(WebCore::WorkerThreadableWebSocketChannel::mainThreadFail):
(WebCore::WorkerThreadableWebSocketChannel::mainThreadDestroy):
(WebCore::WorkerThreadableWebSocketChannel::mainThreadSuspend):
(WebCore::WorkerThreadableWebSocketChannel::mainThreadResume):
* Modules/websockets/WorkerThreadableWebSocketChannel.h:
* bindings/js/JSCallbackData.h:
(WebCore::DeleteCallbackDataTask::DeleteCallbackDataTask):
* bindings/js/JSDOMGlobalObjectTask.cpp:
(WebCore::JSGlobalObjectTask::JSGlobalObjectTask):
* dom/Document.cpp:
(WebCore::Document::postTask):
(WebCore::Document::pendingTasksTimerFired):
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::processMessagePortMessagesSoon):
* dom/ScriptExecutionContext.h:
(WebCore::ScriptExecutionContext::Task::performTask):
(WebCore::ScriptExecutionContext::AddConsoleMessageTask::AddConsoleMessageTask):
* dom/StringCallback.cpp:
(WebCore::StringCallback::scheduleCallback):
* fileapi/FileReader.cpp:
(WebCore::delayedAbort):
(WebCore::FileReader::abort):
(WebCore::FileReader::doAbort): Deleted.
* loader/WorkerThreadableLoader.cpp:
(WebCore::WorkerThreadableLoader::MainThreadBridge::mainThreadCreateLoader):
(WebCore::WorkerThreadableLoader::MainThreadBridge::mainThreadDestroy):
(WebCore::WorkerThreadableLoader::MainThreadBridge::mainThreadCancel):
(WebCore::workerGlobalScopeDidSendData):
(WebCore::workerGlobalScopeDidReceiveResponse):
(WebCore::workerGlobalScopeDidReceiveData):
(WebCore::workerGlobalScopeDidFinishLoading):
(WebCore::workerGlobalScopeDidFail):
(WebCore::workerGlobalScopeDidFailAccessControlCheck):
(WebCore::workerGlobalScopeDidFailRedirectCheck):
* loader/WorkerThreadableLoader.h:
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::postListenerTask):
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::crossThreadRemoveRequestFromCache):
(WebCore::MemoryCache::crossThreadRemoveRequestFromSessionCaches):
* loader/cache/MemoryCache.h:
* workers/DefaultSharedWorkerRepository.cpp:
(WebCore::SharedWorkerProxy::postExceptionToWorkerObject):
(WebCore::SharedWorkerProxy::postConsoleMessageToWorkerObject):
(WebCore::SharedWorkerConnectTask::SharedWorkerConnectTask):
* workers/WorkerEventQueue.cpp:
(WebCore::WorkerEventQueue::enqueueEvent):
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::close):
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::postMessageToWorkerObject):
(WebCore::WorkerMessagingProxy::postMessageToWorkerGlobalScope):
(WebCore::WorkerMessagingProxy::postExceptionToWorkerObject):
(WebCore::WorkerMessagingProxy::postConsoleMessageToWorkerObject):
(WebCore::WorkerMessagingProxy::workerObjectDestroyed):
(WebCore::WorkerMessagingProxy::notifyNetworkStateChange):
(WebCore::WorkerMessagingProxy::connectToInspector):
(WebCore::WorkerMessagingProxy::disconnectFromInspector):
(WebCore::WorkerMessagingProxy::sendMessageToInspector):
(WebCore::WorkerMessagingProxy::workerGlobalScopeDestroyed):
(WebCore::WorkerMessagingProxy::workerGlobalScopeClosed):
(WebCore::WorkerMessagingProxy::postMessageToPageInspector):
(WebCore::WorkerMessagingProxy::confirmMessageFromWorkerObject):
(WebCore::WorkerMessagingProxy::reportPendingActivity):
* workers/WorkerRunLoop.cpp:
(WebCore::WorkerRunLoop::Task::performTask):
* workers/WorkerScriptLoader.cpp:
* workers/WorkerThread.cpp:
(WebCore::WorkerThread::stop):
(WebCore::WorkerThread::releaseFastMallocFreeMemoryInAllThreads):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#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="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</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="#trunkSourceWebCorefileapiFileReadercpp">trunk/Source/WebCore/fileapi/FileReader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderWorkerThreadableLoadercpp">trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderWorkerThreadableLoaderh">trunk/Source/WebCore/loader/WorkerThreadableLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCacheh">trunk/Source/WebCore/loader/cache/MemoryCache.h</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="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerRunLoopcpp">trunk/Source/WebCore/workers/WorkerRunLoop.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerScriptLoadercpp">trunk/Source/WebCore/workers/WorkerScriptLoader.cpp</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 (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/ChangeLog 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -1,5 +1,125 @@
</span><span class="cx"> 2014-06-16 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ Have ScriptExecutionContext::Task functions take in a ScriptExecutionContext reference
+ https://bugs.webkit.org/show_bug.cgi?id=133795
+
+ Reviewed by Andreas Kling.
+
+ The pointer to the ScriptExecutionContext object that is passed to the C++11 lambdas or
+ helper functions wrapped in ScriptExecutionContext::Task is never null, so that parameter
+ should be a reference instead.
+
+ * Modules/webdatabase/Database.cpp:
+ (WebCore::Database::~Database):
+ (WebCore::Database::runTransaction):
+ (WebCore::Database::scheduleTransactionCallback):
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::openDatabase):
+ * Modules/webdatabase/SQLCallbackWrapper.h:
+ (WebCore::SQLCallbackWrapper::clear):
+ * Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
+ (WebCore::ThreadableWebSocketChannelClientWrapper::processPendingTasksCallback):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::processPendingTasks): Dereference the
+ member variable that holds a never-null pointer to the ScriptExecutionContext. This should
+ similarly be a reference.
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didConnectCallback):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveBinaryDataCallback):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmountCallback):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didCloseCallback):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageErrorCallback):
+ * Modules/websockets/ThreadableWebSocketChannelClientWrapper.h:
+ * Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
+ (WebCore::workerGlobalScopeDidSend):
+ (WebCore::workerGlobalScopeDidGetBufferedAmount):
+ (WebCore::workerGlobalScopeDidConnect):
+ (WebCore::workerGlobalScopeDidReceiveMessage):
+ (WebCore::workerGlobalScopeDidReceiveBinaryData):
+ (WebCore::workerGlobalScopeDidUpdateBufferedAmount):
+ (WebCore::workerGlobalScopeDidStartClosingHandshake):
+ (WebCore::workerGlobalScopeDidClose):
+ (WebCore::workerGlobalScopeDidReceiveMessageError):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::mainThreadInitialize):
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadConnect):
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadSend):
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadSendArrayBuffer):
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadSendBlob):
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadBufferedAmount):
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadClose):
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadFail):
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadDestroy):
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadSuspend):
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadResume):
+ * Modules/websockets/WorkerThreadableWebSocketChannel.h:
+ * bindings/js/JSCallbackData.h:
+ (WebCore::DeleteCallbackDataTask::DeleteCallbackDataTask):
+ * bindings/js/JSDOMGlobalObjectTask.cpp:
+ (WebCore::JSGlobalObjectTask::JSGlobalObjectTask):
+ * dom/Document.cpp:
+ (WebCore::Document::postTask):
+ (WebCore::Document::pendingTasksTimerFired):
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::processMessagePortMessagesSoon):
+ * dom/ScriptExecutionContext.h:
+ (WebCore::ScriptExecutionContext::Task::performTask):
+ (WebCore::ScriptExecutionContext::AddConsoleMessageTask::AddConsoleMessageTask):
+ * dom/StringCallback.cpp:
+ (WebCore::StringCallback::scheduleCallback):
+ * fileapi/FileReader.cpp:
+ (WebCore::delayedAbort):
+ (WebCore::FileReader::abort):
+ (WebCore::FileReader::doAbort): Deleted.
+ * loader/WorkerThreadableLoader.cpp:
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::mainThreadCreateLoader):
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::mainThreadDestroy):
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::mainThreadCancel):
+ (WebCore::workerGlobalScopeDidSendData):
+ (WebCore::workerGlobalScopeDidReceiveResponse):
+ (WebCore::workerGlobalScopeDidReceiveData):
+ (WebCore::workerGlobalScopeDidFinishLoading):
+ (WebCore::workerGlobalScopeDidFail):
+ (WebCore::workerGlobalScopeDidFailAccessControlCheck):
+ (WebCore::workerGlobalScopeDidFailRedirectCheck):
+ * loader/WorkerThreadableLoader.h:
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::postListenerTask):
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::crossThreadRemoveRequestFromCache):
+ (WebCore::MemoryCache::crossThreadRemoveRequestFromSessionCaches):
+ * loader/cache/MemoryCache.h:
+ * workers/DefaultSharedWorkerRepository.cpp:
+ (WebCore::SharedWorkerProxy::postExceptionToWorkerObject):
+ (WebCore::SharedWorkerProxy::postConsoleMessageToWorkerObject):
+ (WebCore::SharedWorkerConnectTask::SharedWorkerConnectTask):
+ * workers/WorkerEventQueue.cpp:
+ (WebCore::WorkerEventQueue::enqueueEvent):
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::close):
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::postMessageToWorkerObject):
+ (WebCore::WorkerMessagingProxy::postMessageToWorkerGlobalScope):
+ (WebCore::WorkerMessagingProxy::postExceptionToWorkerObject):
+ (WebCore::WorkerMessagingProxy::postConsoleMessageToWorkerObject):
+ (WebCore::WorkerMessagingProxy::workerObjectDestroyed):
+ (WebCore::WorkerMessagingProxy::notifyNetworkStateChange):
+ (WebCore::WorkerMessagingProxy::connectToInspector):
+ (WebCore::WorkerMessagingProxy::disconnectFromInspector):
+ (WebCore::WorkerMessagingProxy::sendMessageToInspector):
+ (WebCore::WorkerMessagingProxy::workerGlobalScopeDestroyed):
+ (WebCore::WorkerMessagingProxy::workerGlobalScopeClosed):
+ (WebCore::WorkerMessagingProxy::postMessageToPageInspector):
+ (WebCore::WorkerMessagingProxy::confirmMessageFromWorkerObject):
+ (WebCore::WorkerMessagingProxy::reportPendingActivity):
+ * workers/WorkerRunLoop.cpp:
+ (WebCore::WorkerRunLoop::Task::performTask):
+ * workers/WorkerScriptLoader.cpp:
+ * workers/WorkerThread.cpp:
+ (WebCore::WorkerThread::stop):
+ (WebCore::WorkerThread::releaseFastMallocFreeMemoryInAllThreads):
+
+2014-06-16 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> Page::findStringMatchingRanges() should take Vector<RefPtr<Range>> by reference instead of pointer
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133677
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx">
</span><span class="cx"> #include "ChangeVersionData.h"
</span><del>-#include "CrossThreadTask.h"
</del><span class="cx"> #include "DatabaseBackendContext.h"
</span><span class="cx"> #include "DatabaseCallback.h"
</span><span class="cx"> #include "DatabaseContext.h"
</span><span class="lines">@@ -92,8 +91,8 @@
</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><span class="cx"> PassRefPtr<ScriptExecutionContext> passedContext = m_scriptExecutionContext.release();
</span><del>- passedContext->postTask({ScriptExecutionContext::Task::CleanupTask, [=] (ScriptExecutionContext* context) {
- ASSERT_UNUSED(context, context == passedContext);
</del><ins>+ passedContext->postTask({ScriptExecutionContext::Task::CleanupTask, [=] (ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, &context == passedContext);
</ins><span class="cx"> RefPtr<ScriptExecutionContext> scriptExecutionContext(passedContext);
</span><span class="cx"> }});
</span><span class="cx"> }
</span><span class="lines">@@ -171,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<SQLTransactionBackend> transactionBackend(backend()->runTransaction(transaction.release(), readOnly, changeVersionData));
</span><span class="cx"> if (!transactionBackend && errorCallbackProtector)
</span><del>- scriptExecutionContext()->postTask([=] (ScriptExecutionContext*) {
</del><ins>+ scriptExecutionContext()->postTask([=] (ScriptExecutionContext&) {
</ins><span class="cx"> errorCallbackProtector->handleEvent(SQLError::create(SQLError::UNKNOWN_ERR, "database has been closed").get());
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -179,7 +178,7 @@
</span><span class="cx"> void Database::scheduleTransactionCallback(SQLTransaction* transaction)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SQLTransaction> transactionProtector(transaction);
</span><del>- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext*) {
</del><ins>+ m_scriptExecutionContext->postTask([=] (ScriptExecutionContext&) {
</ins><span class="cx"> transactionProtector->performPendingCallback();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -311,7 +311,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*) {
</del><ins>+ database->m_scriptExecutionContext->postTask([=] (ScriptExecutionContext&) {
</ins><span class="cx"> creationCallback->handleEvent(database.get());
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebdatabaseSQLCallbackWrapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webdatabase/SQLCallbackWrapper.h (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webdatabase/SQLCallbackWrapper.h 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLCallbackWrapper.h 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -73,8 +73,8 @@
</span><span class="cx"> scriptExecutionContextPtr = m_scriptExecutionContext.release().leakRef();
</span><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());
</del><ins>+ scriptExecutionContextPtr->postTask({ ScriptExecutionContext::Task::CleanupTask, [=] (ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, &context == scriptExecutionContextPtr && context.isContextThread());
</ins><span class="cx"> callback->deref();
</span><span class="cx"> scriptExecutionContextPtr->deref();
</span><span class="cx"> } });
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -214,9 +214,9 @@
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::processPendingTasksCallback(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
</del><ins>+void ThreadableWebSocketChannelClientWrapper::processPendingTasksCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> wrapper->processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -233,54 +233,54 @@
</span><span class="cx">
</span><span class="cx"> Vector<std::unique_ptr<ScriptExecutionContext::Task>> pendingTasks = std::move(m_pendingTasks);
</span><span class="cx"> for (auto& task : pendingTasks)
</span><del>- task->performTask(nullptr);
</del><ins>+ task->performTask(*m_context);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
</del><ins>+void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, !context);
</del><ins>+ UNUSED_PARAM(context);
</ins><span class="cx"> if (wrapper->m_client)
</span><span class="cx"> wrapper->m_client->didConnect();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, const String& message)
</del><ins>+void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, const String& message)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, !context);
</del><ins>+ UNUSED_PARAM(context);
</ins><span class="cx"> if (wrapper->m_client)
</span><span class="cx"> wrapper->m_client->didReceiveMessage(message);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::didReceiveBinaryDataCallback(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, PassOwnPtr<Vector<char>> binaryData)
</del><ins>+void ThreadableWebSocketChannelClientWrapper::didReceiveBinaryDataCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, PassOwnPtr<Vector<char>> binaryData)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, !context);
</del><ins>+ UNUSED_PARAM(context);
</ins><span class="cx"> if (wrapper->m_client)
</span><span class="cx"> wrapper->m_client->didReceiveBinaryData(binaryData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmountCallback(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long bufferedAmount)
</del><ins>+void ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmountCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long bufferedAmount)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, !context);
</del><ins>+ UNUSED_PARAM(context);
</ins><span class="cx"> if (wrapper->m_client)
</span><span class="cx"> wrapper->m_client->didUpdateBufferedAmount(bufferedAmount);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
</del><ins>+void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, !context);
</del><ins>+ UNUSED_PARAM(context);
</ins><span class="cx"> if (wrapper->m_client)
</span><span class="cx"> wrapper->m_client->didStartClosingHandshake();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::didCloseCallback(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</del><ins>+void ThreadableWebSocketChannelClientWrapper::didCloseCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, !context);
</del><ins>+ UNUSED_PARAM(context);
</ins><span class="cx"> if (wrapper->m_client)
</span><span class="cx"> wrapper->m_client->didClose(unhandledBufferedAmount, closingHandshakeCompletion, code, reason);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::didReceiveMessageErrorCallback(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
</del><ins>+void ThreadableWebSocketChannelClientWrapper::didReceiveMessageErrorCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, !context);
</del><ins>+ UNUSED_PARAM(context);
</ins><span class="cx"> if (wrapper->m_client)
</span><span class="cx"> wrapper->m_client->didReceiveMessageError();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -92,16 +92,16 @@
</span><span class="cx"> private:
</span><span class="cx"> ThreadableWebSocketChannelClientWrapper(ScriptExecutionContext*, WebSocketChannelClient*);
</span><span class="cx">
</span><ins>+ static void processPendingTasksCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
</ins><span class="cx"> void processPendingTasks();
</span><span class="cx">
</span><del>- static void didConnectCallback(ScriptExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
- static void didReceiveMessageCallback(ScriptExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& message);
- static void didReceiveBinaryDataCallback(ScriptExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassOwnPtr<Vector<char>>);
- static void didUpdateBufferedAmountCallback(ScriptExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long bufferedAmount);
- static void didStartClosingHandshakeCallback(ScriptExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
- static void didCloseCallback(ScriptExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);
- static void processPendingTasksCallback(ScriptExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
- static void didReceiveMessageErrorCallback(ScriptExecutionContext*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
</del><ins>+ static void didConnectCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
+ static void didReceiveMessageCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& message);
+ static void didReceiveBinaryDataCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassOwnPtr<Vector<char>>);
+ static void didUpdateBufferedAmountCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long bufferedAmount);
+ static void didStartClosingHandshakeCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
+ static void didCloseCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);
+ static void didReceiveMessageErrorCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
</ins><span class="cx">
</span><span class="cx"> ScriptExecutionContext* m_context;
</span><span class="cx"> WebSocketChannelClient* m_client;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -168,9 +168,9 @@
</span><span class="cx"> m_mainWebSocketChannel->connect(url, protocol);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidSend(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, ThreadableWebSocketChannel::SendResult sendRequestResult)
</del><ins>+static void workerGlobalScopeDidSend(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, ThreadableWebSocketChannel::SendResult sendRequestResult)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->setSendRequestResult(sendRequestResult);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -201,9 +201,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidSend, m_workerClientWrapper, sendRequestResult), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidGetBufferedAmount(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long bufferedAmount)
</del><ins>+static void workerGlobalScopeDidGetBufferedAmount(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long bufferedAmount)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->setBufferedAmount(bufferedAmount);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -257,9 +257,9 @@
</span><span class="cx"> m_mainWebSocketChannel->resume();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidConnect(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, const String& subprotocol, const String& extensions)
</del><ins>+static void workerGlobalScopeDidConnect(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, const String& subprotocol, const String& extensions)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->setSubprotocol(subprotocol);
</span><span class="cx"> workerClientWrapper->setExtensions(extensions);
</span><span class="cx"> workerClientWrapper->didConnect();
</span><span class="lines">@@ -271,9 +271,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidConnect, m_workerClientWrapper, m_mainWebSocketChannel->subprotocol(), m_mainWebSocketChannel->extensions()), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidReceiveMessage(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, const String& message)
</del><ins>+static void workerGlobalScopeDidReceiveMessage(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, const String& message)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->didReceiveMessage(message);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -283,9 +283,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidReceiveMessage, m_workerClientWrapper, message), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidReceiveBinaryData(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassOwnPtr<Vector<char>> binaryData)
</del><ins>+static void workerGlobalScopeDidReceiveBinaryData(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassOwnPtr<Vector<char>> binaryData)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->didReceiveBinaryData(binaryData);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -295,9 +295,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidReceiveBinaryData, m_workerClientWrapper, binaryData), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidUpdateBufferedAmount(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long bufferedAmount)
</del><ins>+static void workerGlobalScopeDidUpdateBufferedAmount(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long bufferedAmount)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->didUpdateBufferedAmount(bufferedAmount);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -307,9 +307,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidUpdateBufferedAmount, m_workerClientWrapper, bufferedAmount), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidStartClosingHandshake(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
</del><ins>+static void workerGlobalScopeDidStartClosingHandshake(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->didStartClosingHandshake();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -319,9 +319,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidStartClosingHandshake, m_workerClientWrapper), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidClose(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</del><ins>+static void workerGlobalScopeDidClose(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->didClose(unhandledBufferedAmount, closingHandshakeCompletion, code, reason);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -332,9 +332,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidClose, m_workerClientWrapper, unhandledBufferedAmount, closingHandshakeCompletion, code, reason), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidReceiveMessageError(ScriptExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
</del><ins>+static void workerGlobalScopeDidReceiveMessageError(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->didReceiveMessageError();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -359,16 +359,16 @@
</span><span class="cx"> disconnect();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::Bridge::mainThreadInitialize(ScriptExecutionContext* context, WorkerLoaderProxy* loaderProxy, PassRefPtr<ThreadableWebSocketChannelClientWrapper> prpClientWrapper, const String& taskMode)
</del><ins>+void WorkerThreadableWebSocketChannel::Bridge::mainThreadInitialize(ScriptExecutionContext& context, WorkerLoaderProxy* loaderProxy, PassRefPtr<ThreadableWebSocketChannelClientWrapper> prpClientWrapper, const String& taskMode)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><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());
</del><ins>+ Peer* peerPtr = Peer::create(clientWrapper, *loaderProxy, &context, taskMode);
+ bool sent = loaderProxy->postTaskForModeToWorkerGlobalScope({ ScriptExecutionContext::Task::CleanupTask, [=] (ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> if (clientWrapper->failedWebSocketChannelCreation()) {
</span><span class="cx"> // If Bridge::initialize() quitted earlier, we need to kick mainThreadDestroy() to delete the peer.
</span><span class="cx"> loaderProxy->postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadDestroy, AllowCrossThreadAccess(peerPtr)));
</span><span class="lines">@@ -394,10 +394,10 @@
</span><span class="cx"> m_workerClientWrapper->setFailedWebSocketChannelCreation();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadConnect(ScriptExecutionContext* context, Peer* peer, const URL& url, const String& protocol)
</del><ins>+void WorkerThreadableWebSocketChannel::mainThreadConnect(ScriptExecutionContext& context, Peer* peer, const URL& url, const String& protocol)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><span class="cx"> peer->connect(url, protocol);
</span><span class="lines">@@ -411,29 +411,29 @@
</span><span class="cx"> m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadConnect, AllowCrossThreadAccess(m_peer), url, protocol));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadSend(ScriptExecutionContext* context, Peer* peer, const String& message)
</del><ins>+void WorkerThreadableWebSocketChannel::mainThreadSend(ScriptExecutionContext& context, Peer* peer, const String& message)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><span class="cx"> peer->send(message);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadSendArrayBuffer(ScriptExecutionContext* context, Peer* peer, PassOwnPtr<Vector<char>> data)
</del><ins>+void WorkerThreadableWebSocketChannel::mainThreadSendArrayBuffer(ScriptExecutionContext& context, Peer* peer, PassOwnPtr<Vector<char>> data)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><span class="cx"> RefPtr<ArrayBuffer> arrayBuffer = ArrayBuffer::create(data->data(), data->size());
</span><span class="cx"> peer->send(*arrayBuffer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadSendBlob(ScriptExecutionContext* context, Peer* peer, const URL& url, const String& type, long long size)
</del><ins>+void WorkerThreadableWebSocketChannel::mainThreadSendBlob(ScriptExecutionContext& context, Peer* peer, const URL& url, const String& type, long long size)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><span class="cx"> RefPtr<Blob> blob = Blob::deserialize(url, type, size);
</span><span class="lines">@@ -486,10 +486,10 @@
</span><span class="cx"> return clientWrapper->sendRequestResult();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadBufferedAmount(ScriptExecutionContext* context, Peer* peer)
</del><ins>+void WorkerThreadableWebSocketChannel::mainThreadBufferedAmount(ScriptExecutionContext& context, Peer* peer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><span class="cx"> peer->bufferedAmount();
</span><span class="lines">@@ -509,10 +509,10 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadClose(ScriptExecutionContext* context, Peer* peer, int code, const String& reason)
</del><ins>+void WorkerThreadableWebSocketChannel::mainThreadClose(ScriptExecutionContext& context, Peer* peer, int code, const String& reason)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><span class="cx"> peer->close(code, reason);
</span><span class="lines">@@ -525,10 +525,10 @@
</span><span class="cx"> m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadClose, AllowCrossThreadAccess(m_peer), code, reason));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadFail(ScriptExecutionContext* context, Peer* peer, const String& reason)
</del><ins>+void WorkerThreadableWebSocketChannel::mainThreadFail(ScriptExecutionContext& context, Peer* peer, const String& reason)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><span class="cx"> peer->fail(reason);
</span><span class="lines">@@ -541,10 +541,10 @@
</span><span class="cx"> m_loaderProxy.postTaskToLoader(CrossThreadTask(&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, Peer* peerPtr)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx"> std::unique_ptr<Peer> peer(peerPtr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -558,10 +558,10 @@
</span><span class="cx"> m_workerGlobalScope = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadSuspend(ScriptExecutionContext* context, Peer* peer)
</del><ins>+void WorkerThreadableWebSocketChannel::mainThreadSuspend(ScriptExecutionContext& context, Peer* peer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><span class="cx"> peer->suspend();
</span><span class="lines">@@ -574,10 +574,10 @@
</span><span class="cx"> m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadSuspend, AllowCrossThreadAccess(m_peer)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadResume(ScriptExecutionContext* context, Peer* peer)
</del><ins>+void WorkerThreadableWebSocketChannel::mainThreadResume(ScriptExecutionContext& context, Peer* peer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><span class="cx"> peer->resume();
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> static void setWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, Peer*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
</span><span class="cx">
</span><span class="cx"> // Executed on the main thread to create a Peer for this bridge.
</span><del>- static void mainThreadInitialize(ScriptExecutionContext*, WorkerLoaderProxy*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& taskMode);
</del><ins>+ static void mainThreadInitialize(ScriptExecutionContext&, WorkerLoaderProxy*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& taskMode);
</ins><span class="cx">
</span><span class="cx"> // Executed on the worker context's thread.
</span><span class="cx"> void clearClientWrapper();
</span><span class="lines">@@ -169,16 +169,16 @@
</span><span class="cx">
</span><span class="cx"> WorkerThreadableWebSocketChannel(WorkerGlobalScope*, WebSocketChannelClient*, const String& taskMode);
</span><span class="cx">
</span><del>- static void mainThreadConnect(ScriptExecutionContext*, Peer*, const URL&, const String& protocol);
- static void mainThreadSend(ScriptExecutionContext*, Peer*, const String& message);
- static void mainThreadSendArrayBuffer(ScriptExecutionContext*, Peer*, PassOwnPtr<Vector<char>>);
- static void mainThreadSendBlob(ScriptExecutionContext*, Peer*, const URL&, const String& type, long long size);
- static void mainThreadBufferedAmount(ScriptExecutionContext*, Peer*);
- static void mainThreadClose(ScriptExecutionContext*, Peer*, int code, const String& reason);
- static void mainThreadFail(ScriptExecutionContext*, Peer*, const String& reason);
- static void mainThreadDestroy(ScriptExecutionContext*, Peer*);
- static void mainThreadSuspend(ScriptExecutionContext*, Peer*);
- static void mainThreadResume(ScriptExecutionContext*, Peer*);
</del><ins>+ static void mainThreadConnect(ScriptExecutionContext&, Peer*, const URL&, const String& protocol);
+ static void mainThreadSend(ScriptExecutionContext&, Peer*, const String& message);
+ static void mainThreadSendArrayBuffer(ScriptExecutionContext&, Peer*, PassOwnPtr<Vector<char>>);
+ static void mainThreadSendBlob(ScriptExecutionContext&, Peer*, const URL&, const String& type, long long size);
+ static void mainThreadBufferedAmount(ScriptExecutionContext&, Peer*);
+ static void mainThreadClose(ScriptExecutionContext&, Peer*, int code, const String& reason);
+ static void mainThreadFail(ScriptExecutionContext&, Peer*, const String& reason);
+ static void mainThreadDestroy(ScriptExecutionContext&, Peer*);
+ static void mainThreadSuspend(ScriptExecutionContext&, Peer*);
+ static void mainThreadResume(ScriptExecutionContext&, Peer*);
</ins><span class="cx">
</span><span class="cx"> class WorkerGlobalScopeDidInitializeTask;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCallbackDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCallbackData.h (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCallbackData.h 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/bindings/js/JSCallbackData.h 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> class DeleteCallbackDataTask : public ScriptExecutionContext::Task {
</span><span class="cx"> public:
</span><span class="cx"> DeleteCallbackDataTask(JSCallbackData* data)
</span><del>- : ScriptExecutionContext::Task({ ScriptExecutionContext::Task::CleanupTask, [=] (ScriptExecutionContext*) {
</del><ins>+ : ScriptExecutionContext::Task({ ScriptExecutionContext::Task::CleanupTask, [=] (ScriptExecutionContext&) {
</ins><span class="cx"> delete data;
</span><span class="cx"> } })
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMGlobalObjectTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObjectTask.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> : ScriptExecutionContext::Task(nullptr)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<JSGlobalObjectCallback> callback = JSGlobalObjectCallback::create(globalObject, task);
</span><del>- m_task = [=] (ScriptExecutionContext*) {
</del><ins>+ m_task = [=] (ScriptExecutionContext&) {
</ins><span class="cx"> callback->call();
</span><span class="cx"> };
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -4922,7 +4922,7 @@
</span><span class="cx"> if ((page && page->defersLoading()) || !document->m_pendingTasks.isEmpty())
</span><span class="cx"> document->m_pendingTasks.append(std::move(*task.release()));
</span><span class="cx"> else
</span><del>- task->performTask(document);
</del><ins>+ task->performTask(*document);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4930,7 +4930,7 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<Task> pendingTasks = std::move(m_pendingTasks);
</span><span class="cx"> for (auto& task : pendingTasks)
</span><del>- task.performTask(this);
</del><ins>+ 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="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -132,8 +132,8 @@
</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([] (ScriptExecutionContext& context) {
+ context.dispatchMessagePortEvents();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -117,14 +117,14 @@
</span><span class="cx"> public:
</span><span class="cx"> enum CleanupTaskTag { CleanupTask };
</span><span class="cx">
</span><del>- template<typename T, typename = typename std::enable_if<!std::is_base_of<Task, T>::value && std::is_convertible<T, std::function<void (ScriptExecutionContext*)>>::value>::type>
</del><ins>+ template<typename T, typename = typename std::enable_if<!std::is_base_of<Task, T>::value && std::is_convertible<T, std::function<void (ScriptExecutionContext&)>>::value>::type>
</ins><span class="cx"> Task(T task)
</span><span class="cx"> : m_task(std::move(task))
</span><span class="cx"> , m_isCleanupTask(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- template<typename T, typename = typename std::enable_if<std::is_convertible<T, std::function<void (ScriptExecutionContext*)>>::value>::type>
</del><ins>+ template<typename T, typename = typename std::enable_if<std::is_convertible<T, std::function<void (ScriptExecutionContext&)>>::value>::type>
</ins><span class="cx"> Task(CleanupTaskTag, T task)
</span><span class="cx"> : m_task(std::move(task))
</span><span class="cx"> , m_isCleanupTask(true)
</span><span class="lines">@@ -137,11 +137,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void performTask(ScriptExecutionContext* context) { m_task(context); }
</del><ins>+ void performTask(ScriptExecutionContext& context) { m_task(context); }
</ins><span class="cx"> bool isCleanupTask() const { return m_isCleanupTask; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- std::function<void (ScriptExecutionContext*)> m_task;
</del><ins>+ std::function<void (ScriptExecutionContext&)> m_task;
</ins><span class="cx"> bool m_isCleanupTask;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -178,8 +178,8 @@
</span><span class="cx"> class AddConsoleMessageTask : public Task {
</span><span class="cx"> public:
</span><span class="cx"> AddConsoleMessageTask(MessageSource source, MessageLevel level, const String& message)
</span><del>- : Task([=] (ScriptExecutionContext* context) {
- context->addConsoleMessage(source, level, message);
</del><ins>+ : Task([=] (ScriptExecutionContext& context) {
+ context.addConsoleMessage(source, level, message);
</ins><span class="cx"> })
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomStringCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StringCallback.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StringCallback.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/dom/StringCallback.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> void StringCallback::scheduleCallback(ScriptExecutionContext* context, const String& data)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<StringCallback> protector(this);
</span><del>- context->postTask([=] (ScriptExecutionContext*) {
</del><ins>+ context->postTask([=] (ScriptExecutionContext&) {
</ins><span class="cx"> this->handleEvent(data);
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReader.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReader.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/fileapi/FileReader.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx">
</span><span class="cx"> #include "FileReader.h"
</span><span class="cx">
</span><del>-#include "CrossThreadTask.h"
</del><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "File.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -144,11 +143,6 @@
</span><span class="cx"> m_loader->start(scriptExecutionContext(), m_blob.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void delayedAbort(ScriptExecutionContext*, FileReader* reader)
-{
- reader->doAbort();
-}
-
</del><span class="cx"> void FileReader::abort()
</span><span class="cx"> {
</span><span class="cx"> LOG(FileAPI, "FileReader: aborting\n");
</span><span class="lines">@@ -158,24 +152,21 @@
</span><span class="cx"> m_aborting = true;
</span><span class="cx">
</span><span class="cx"> // Schedule to have the abort done later since abort() might be called from the event handler and we do not want the resource loading code to be in the stack.
</span><del>- scriptExecutionContext()->postTask(CrossThreadTask(&delayedAbort, AllowAccessLater(this)));
-}
</del><ins>+ scriptExecutionContext()->postTask([=](ScriptExecutionContext&) {
+ ASSERT(m_state != DONE);
</ins><span class="cx">
</span><del>-void FileReader::doAbort()
-{
- ASSERT(m_state != DONE);
</del><ins>+ terminate();
+ m_aborting = false;
</ins><span class="cx">
</span><del>- terminate();
- m_aborting = false;
</del><ins>+ m_error = FileError::create(FileError::ABORT_ERR);
</ins><span class="cx">
</span><del>- m_error = FileError::create(FileError::ABORT_ERR);
</del><ins>+ fireEvent(eventNames().errorEvent);
+ fireEvent(eventNames().abortEvent);
+ fireEvent(eventNames().loadendEvent);
</ins><span class="cx">
</span><del>- fireEvent(eventNames().errorEvent);
- fireEvent(eventNames().abortEvent);
- fireEvent(eventNames().loadendEvent);
-
- // All possible events have fired and we're done, no more pending activity.
- unsetPendingActivity(this);
</del><ins>+ // All possible events have fired and we're done, no more pending activity.
+ unsetPendingActivity(this);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FileReader::terminate()
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -98,10 +98,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableLoader::MainThreadBridge::mainThreadCreateLoader(ScriptExecutionContext* context, MainThreadBridge* thisPtr, PassOwnPtr<CrossThreadResourceRequestData> requestData, ThreadableLoaderOptions options, const String& outgoingReferrer)
</del><ins>+void WorkerThreadableLoader::MainThreadBridge::mainThreadCreateLoader(ScriptExecutionContext& context, MainThreadBridge* thisPtr, PassOwnPtr<CrossThreadResourceRequestData> requestData, ThreadableLoaderOptions options, const String& outgoingReferrer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- Document* document = toDocument(context);
</del><ins>+ Document* document = toDocument(&context);
</ins><span class="cx">
</span><span class="cx"> OwnPtr<ResourceRequest> request(ResourceRequest::adopt(requestData));
</span><span class="cx"> request->setHTTPReferrer(outgoingReferrer);
</span><span class="lines">@@ -112,10 +112,10 @@
</span><span class="cx"> ASSERT(thisPtr->m_mainThreadLoader);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableLoader::MainThreadBridge::mainThreadDestroy(ScriptExecutionContext* context, MainThreadBridge* thisPtr)
</del><ins>+void WorkerThreadableLoader::MainThreadBridge::mainThreadDestroy(ScriptExecutionContext& context, MainThreadBridge* thisPtr)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx"> delete thisPtr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -128,10 +128,10 @@
</span><span class="cx"> m_loaderProxy.postTaskToLoader(CrossThreadTask(&MainThreadBridge::mainThreadDestroy, AllowCrossThreadAccess(this)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableLoader::MainThreadBridge::mainThreadCancel(ScriptExecutionContext* context, MainThreadBridge* thisPtr)
</del><ins>+void WorkerThreadableLoader::MainThreadBridge::mainThreadCancel(ScriptExecutionContext& context, MainThreadBridge* thisPtr)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx">
</span><span class="cx"> if (!thisPtr->m_mainThreadLoader)
</span><span class="cx"> return;
</span><span class="lines">@@ -158,9 +158,9 @@
</span><span class="cx"> m_workerClientWrapper->clearClient();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidSendData(ScriptExecutionContext* context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
</del><ins>+static void workerGlobalScopeDidSendData(ScriptExecutionContext& context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->didSendData(bytesSent, totalBytesToBeSent);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -169,9 +169,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidSendData, m_workerClientWrapper, bytesSent, totalBytesToBeSent), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidReceiveResponse(ScriptExecutionContext* context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, unsigned long identifier, PassOwnPtr<CrossThreadResourceResponseData> responseData)
</del><ins>+static void workerGlobalScopeDidReceiveResponse(ScriptExecutionContext& context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, unsigned long identifier, PassOwnPtr<CrossThreadResourceResponseData> responseData)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> OwnPtr<ResourceResponse> response(ResourceResponse::adopt(responseData));
</span><span class="cx"> workerClientWrapper->didReceiveResponse(identifier, *response);
</span><span class="cx"> }
</span><span class="lines">@@ -181,9 +181,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidReceiveResponse, m_workerClientWrapper, identifier, response), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidReceiveData(ScriptExecutionContext* context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, PassOwnPtr<Vector<char>> vectorData)
</del><ins>+static void workerGlobalScopeDidReceiveData(ScriptExecutionContext& context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, PassOwnPtr<Vector<char>> vectorData)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->didReceiveData(vectorData->data(), vectorData->size());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -194,9 +194,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidReceiveData, m_workerClientWrapper, vector.release()), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidFinishLoading(ScriptExecutionContext* context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, unsigned long identifier, double finishTime)
</del><ins>+static void workerGlobalScopeDidFinishLoading(ScriptExecutionContext& context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, unsigned long identifier, double finishTime)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->didFinishLoading(identifier, finishTime);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -205,9 +205,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidFinishLoading, m_workerClientWrapper, identifier, finishTime), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidFail(ScriptExecutionContext* context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, const ResourceError& error)
</del><ins>+static void workerGlobalScopeDidFail(ScriptExecutionContext& context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, const ResourceError& error)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->didFail(error);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -216,9 +216,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidFail, m_workerClientWrapper, error), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidFailAccessControlCheck(ScriptExecutionContext* context, PassRefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, const ResourceError& error)
</del><ins>+static void workerGlobalScopeDidFailAccessControlCheck(ScriptExecutionContext& context, PassRefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, const ResourceError& error)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->didFailAccessControlCheck(error);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -227,9 +227,9 @@
</span><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidFailAccessControlCheck, m_workerClientWrapper, error), m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidFailRedirectCheck(ScriptExecutionContext* context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper)
</del><ins>+static void workerGlobalScopeDidFailRedirectCheck(ScriptExecutionContext& context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper)
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(context, context->isWorkerGlobalScope());
</del><ins>+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</ins><span class="cx"> workerClientWrapper->didFailRedirectCheck();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderWorkerThreadableLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.h (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/WorkerThreadableLoader.h 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.h 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -105,11 +105,11 @@
</span><span class="cx"> void clearClientWrapper();
</span><span class="cx">
</span><span class="cx"> // All executed on the main thread.
</span><del>- static void mainThreadDestroy(ScriptExecutionContext*, MainThreadBridge*);
</del><ins>+ static void mainThreadDestroy(ScriptExecutionContext&, MainThreadBridge*);
</ins><span class="cx"> ~MainThreadBridge();
</span><span class="cx">
</span><del>- static void mainThreadCreateLoader(ScriptExecutionContext*, MainThreadBridge*, PassOwnPtr<CrossThreadResourceRequestData>, ThreadableLoaderOptions, const String& outgoingReferrer);
- static void mainThreadCancel(ScriptExecutionContext*, MainThreadBridge*);
</del><ins>+ static void mainThreadCreateLoader(ScriptExecutionContext&, MainThreadBridge*, PassOwnPtr<CrossThreadResourceRequestData>, ThreadableLoaderOptions, const String& outgoingReferrer);
+ static void mainThreadCancel(ScriptExecutionContext&, MainThreadBridge*);
</ins><span class="cx"> virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
</span><span class="cx"> virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&) override;
</span><span class="cx"> virtual void didReceiveData(const char*, int dataLength) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -1117,8 +1117,8 @@
</span><span class="cx"> ASSERT(frame->loader().documentLoader() == loader);
</span><span class="cx">
</span><span class="cx"> RefPtr<DocumentLoader> loaderProtector(loader);
</span><del>- frame->document()->postTask([=] (ScriptExecutionContext* context) {
- ASSERT_UNUSED(context, context->isDocument());
</del><ins>+ frame->document()->postTask([=] (ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, context.isDocument());
</ins><span class="cx"> Frame* frame = loaderProtector->frame();
</span><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -877,16 +877,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MemoryCache::crossThreadRemoveRequestFromCache(ScriptExecutionContext* context, PassOwnPtr<WebCore::CrossThreadResourceRequestData> requestData, SessionID sessionID)
</del><ins>+void MemoryCache::crossThreadRemoveRequestFromCache(ScriptExecutionContext& context, PassOwnPtr<WebCore::CrossThreadResourceRequestData> requestData, SessionID sessionID)
</ins><span class="cx"> {
</span><span class="cx"> OwnPtr<ResourceRequest> request(ResourceRequest::adopt(requestData));
</span><del>- MemoryCache::removeRequestFromCacheImpl(context, *request, sessionID);
</del><ins>+ MemoryCache::removeRequestFromCacheImpl(&context, *request, sessionID);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void MemoryCache::crossThreadRemoveRequestFromSessionCaches(ScriptExecutionContext* context, PassOwnPtr<WebCore::CrossThreadResourceRequestData> requestData)
</del><ins>+void MemoryCache::crossThreadRemoveRequestFromSessionCaches(ScriptExecutionContext& context, PassOwnPtr<WebCore::CrossThreadResourceRequestData> requestData)
</ins><span class="cx"> {
</span><span class="cx"> OwnPtr<ResourceRequest> request(ResourceRequest::adopt(requestData));
</span><del>- MemoryCache::removeRequestFromSessionCaches(context, *request);
</del><ins>+ MemoryCache::removeRequestFromSessionCaches(&context, *request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryCache::TypeStatistic::addResource(CachedResource* o)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -228,8 +228,8 @@
</span><span class="cx"> CachedResource* resourceForRequestImpl(const ResourceRequest&, CachedResourceMap&);
</span><span class="cx"> static void removeRequestFromCacheImpl(ScriptExecutionContext*, const ResourceRequest&, SessionID);
</span><span class="cx"> static void removeRequestFromSessionCachesImpl(ScriptExecutionContext*, const ResourceRequest&);
</span><del>- static void crossThreadRemoveRequestFromCache(ScriptExecutionContext*, PassOwnPtr<CrossThreadResourceRequestData>, SessionID);
- static void crossThreadRemoveRequestFromSessionCaches(ScriptExecutionContext*, PassOwnPtr<CrossThreadResourceRequestData>);
</del><ins>+ static void crossThreadRemoveRequestFromCache(ScriptExecutionContext&, PassOwnPtr<CrossThreadResourceRequestData>, SessionID);
+ static void crossThreadRemoveRequestFromSessionCaches(ScriptExecutionContext&, PassOwnPtr<CrossThreadResourceRequestData>);
</ins><span class="cx">
</span><span class="cx"> CachedResourceMap& getSessionMap(SessionID);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -185,8 +185,8 @@
</span><span class="cx"> String sourceURLCopy = sourceURL.isolatedCopy();
</span><span class="cx">
</span><span class="cx"> for (auto& document : m_workerDocuments)
</span><del>- document->postTask([=] (ScriptExecutionContext* context) {
- context->reportException(errorMessageCopy, lineNumber, columnNumber, sourceURLCopy, nullptr);
</del><ins>+ document->postTask([=] (ScriptExecutionContext& context) {
+ context.reportException(errorMessageCopy, lineNumber, columnNumber, sourceURLCopy, nullptr);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -197,8 +197,8 @@
</span><span class="cx"> String sourceURLCopy = sourceURL.isolatedCopy();
</span><span class="cx">
</span><span class="cx"> for (auto& document : m_workerDocuments)
</span><del>- document->postTask([=] (ScriptExecutionContext* context) {
- context->addConsoleMessage(source, level, messageCopy, sourceURLCopy, lineNumber, columnNumber);
</del><ins>+ document->postTask([=] (ScriptExecutionContext& context) {
+ context.addConsoleMessage(source, level, messageCopy, sourceURLCopy, lineNumber, columnNumber);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -255,11 +255,11 @@
</span><span class="cx"> class SharedWorkerConnectTask : public ScriptExecutionContext::Task {
</span><span class="cx"> public:
</span><span class="cx"> SharedWorkerConnectTask(MessagePortChannel* channel)
</span><del>- : ScriptExecutionContext::Task([=] (ScriptExecutionContext* context) {
- RefPtr<MessagePort> port = MessagePort::create(*context);
</del><ins>+ : ScriptExecutionContext::Task([=] (ScriptExecutionContext& context) {
+ RefPtr<MessagePort> port = MessagePort::create(context);
</ins><span class="cx"> port->entangle(std::unique_ptr<MessagePortChannel>(channel));
</span><del>- ASSERT_WITH_SECURITY_IMPLICATION(context->isWorkerGlobalScope());
- WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(context.isWorkerGlobalScope());
+ WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(&context);
</ins><span class="cx"> // Since close() stops the thread event loop, this should not ever get called while closing.
</span><span class="cx"> ASSERT(!workerGlobalScope->isClosing());
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(workerGlobalScope->isSharedWorkerGlobalScope());
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerEventQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerEventQueue.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerEventQueue.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/workers/WorkerEventQueue.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> EventDispatcher* eventDispatcherPtr = new EventDispatcher(event.get(), *this);
</span><span class="cx"> m_eventDispatcherMap.add(event, eventDispatcherPtr);
</span><del>- m_scriptExecutionContext.postTask([=] (ScriptExecutionContext*) {
</del><ins>+ m_scriptExecutionContext.postTask([=] (ScriptExecutionContext&) {
</ins><span class="cx"> std::unique_ptr<EventDispatcher> eventDispatcher(eventDispatcherPtr);
</span><span class="cx"> eventDispatcher->dispatch();
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -132,9 +132,9 @@
</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);
</del><ins>+ postTask({ ScriptExecutionContext::Task::CleanupTask, [] (ScriptExecutionContext& context) {
+ ASSERT_WITH_SECURITY_IMPLICATION(context.isWorkerGlobalScope());
+ WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(&context);
</ins><span class="cx"> // Notify parent that this context is closed. Parent is responsible for calling WorkerThread::stop().
</span><span class="cx"> workerGlobalScope->thread().workerReportingProxy().workerGlobalScopeClosed();
</span><span class="cx"> } });
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -96,12 +96,12 @@
</span><span class="cx"> void WorkerMessagingProxy::postMessageToWorkerObject(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels)
</span><span class="cx"> {
</span><span class="cx"> MessagePortChannelArray* channelsPtr = channels.release();
</span><del>- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext* context) {
</del><ins>+ m_scriptExecutionContext->postTask([=] (ScriptExecutionContext& context) {
</ins><span class="cx"> Worker* workerObject = this->workerObject();
</span><span class="cx"> if (!workerObject || askedToTerminate())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- std::unique_ptr<MessagePortArray> ports = MessagePort::entanglePorts(*context, std::unique_ptr<MessagePortChannelArray>(channelsPtr));
</del><ins>+ std::unique_ptr<MessagePortArray> ports = MessagePort::entanglePorts(context, std::unique_ptr<MessagePortChannelArray>(channelsPtr));
</ins><span class="cx"> workerObject->dispatchEvent(MessageEvent::create(std::move(ports), message));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -112,12 +112,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> MessagePortChannelArray* channelsPtr = channels.release();
</span><del>- 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><ins>+ 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());
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> if (m_workerThread) {
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> {
</span><span class="cx"> String errorMessageCopy = errorMessage.isolatedCopy();
</span><span class="cx"> String sourceURLCopy = sourceURL.isolatedCopy();
</span><del>- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext* context) {
</del><ins>+ m_scriptExecutionContext->postTask([=] (ScriptExecutionContext& context) {
</ins><span class="cx"> Worker* workerObject = this->workerObject();
</span><span class="cx"> if (!workerObject)
</span><span class="cx"> return;
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx">
</span><span class="cx"> bool errorHandled = !workerObject->dispatchEvent(ErrorEvent::create(errorMessageCopy, sourceURLCopy, lineNumber, columnNumber));
</span><span class="cx"> if (!errorHandled)
</span><del>- context->reportException(errorMessageCopy, lineNumber, columnNumber, sourceURLCopy, 0);
</del><ins>+ context.reportException(errorMessageCopy, lineNumber, columnNumber, sourceURLCopy, 0);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -166,10 +166,10 @@
</span><span class="cx"> {
</span><span class="cx"> String messageCopy = message.isolatedCopy();
</span><span class="cx"> String sourceURLCopy = sourceURL.isolatedCopy();
</span><del>- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext* context) {
</del><ins>+ m_scriptExecutionContext->postTask([=] (ScriptExecutionContext& context) {
</ins><span class="cx"> if (askedToTerminate())
</span><span class="cx"> return;
</span><del>- context->addConsoleMessage(source, level, messageCopy, sourceURLCopy, lineNumber, columnNumber);
</del><ins>+ context.addConsoleMessage(source, level, messageCopy, sourceURLCopy, lineNumber, columnNumber);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> void WorkerMessagingProxy::workerObjectDestroyed()
</span><span class="cx"> {
</span><span class="cx"> m_workerObject = 0;
</span><del>- m_scriptExecutionContext->postTask([this] (ScriptExecutionContext*) {
</del><ins>+ m_scriptExecutionContext->postTask([this] (ScriptExecutionContext&) {
</ins><span class="cx"> m_mayBeDestroyed = true;
</span><span class="cx"> if (m_workerThread)
</span><span class="cx"> terminateWorkerGlobalScope();
</span><span class="lines">@@ -211,8 +211,8 @@
</span><span class="cx"> if (!m_workerThread)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_workerThread->runLoop().postTask([=] (ScriptExecutionContext* context) {
- toWorkerGlobalScope(context)->dispatchEvent(Event::create(isOnline ? eventNames().onlineEvent : eventNames().offlineEvent, false, false));
</del><ins>+ m_workerThread->runLoop().postTask([=] (ScriptExecutionContext& context) {
+ toWorkerGlobalScope(&context)->dispatchEvent(Event::create(isOnline ? eventNames().onlineEvent : eventNames().offlineEvent, false, false));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -223,8 +223,8 @@
</span><span class="cx"> return;
</span><span class="cx"> ASSERT(!m_pageInspector);
</span><span class="cx"> m_pageInspector = pageInspector;
</span><del>- m_workerThread->runLoop().postTaskForMode([] (ScriptExecutionContext* context) {
- toWorkerGlobalScope(context)->workerInspectorController().connectFrontend();
</del><ins>+ m_workerThread->runLoop().postTaskForMode([] (ScriptExecutionContext& context) {
+ toWorkerGlobalScope(&context)->workerInspectorController().connectFrontend();
</ins><span class="cx"> }, WorkerDebuggerAgent::debuggerTaskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -233,8 +233,8 @@
</span><span class="cx"> m_pageInspector = 0;
</span><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return;
</span><del>- m_workerThread->runLoop().postTaskForMode([] (ScriptExecutionContext* context) {
- toWorkerGlobalScope(context)->workerInspectorController().disconnectFrontend(Inspector::InspectorDisconnectReason::InspectorDestroyed);
</del><ins>+ m_workerThread->runLoop().postTaskForMode([] (ScriptExecutionContext& context) {
+ toWorkerGlobalScope(&context)->workerInspectorController().disconnectFrontend(Inspector::InspectorDisconnectReason::InspectorDestroyed);
</ins><span class="cx"> }, WorkerDebuggerAgent::debuggerTaskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -243,8 +243,8 @@
</span><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return;
</span><span class="cx"> String messageCopy = message.isolatedCopy();
</span><del>- m_workerThread->runLoop().postTaskForMode([messageCopy] (ScriptExecutionContext* context) {
- toWorkerGlobalScope(context)->workerInspectorController().dispatchMessageFromFrontend(messageCopy);
</del><ins>+ m_workerThread->runLoop().postTaskForMode([messageCopy] (ScriptExecutionContext& context) {
+ toWorkerGlobalScope(&context)->workerInspectorController().dispatchMessageFromFrontend(messageCopy);
</ins><span class="cx"> }, WorkerDebuggerAgent::debuggerTaskMode);
</span><span class="cx"> WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(m_workerThread.get());
</span><span class="cx"> }
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::workerGlobalScopeDestroyed()
</span><span class="cx"> {
</span><del>- m_scriptExecutionContext->postTask([this] (ScriptExecutionContext*) {
</del><ins>+ m_scriptExecutionContext->postTask([this] (ScriptExecutionContext&) {
</ins><span class="cx"> workerGlobalScopeDestroyedInternal();
</span><span class="cx"> });
</span><span class="cx"> // Will execute workerGlobalScopeDestroyedInternal() on context's thread.
</span><span class="lines">@@ -261,7 +261,7 @@
</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*) {
</del><ins>+ m_scriptExecutionContext->postTask([this] (ScriptExecutionContext&) {
</ins><span class="cx"> terminateWorkerGlobalScope();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> void WorkerMessagingProxy::postMessageToPageInspector(const String& message)
</span><span class="cx"> {
</span><span class="cx"> String messageCopy = message.isolatedCopy();
</span><del>- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext*) {
</del><ins>+ m_scriptExecutionContext->postTask([=] (ScriptExecutionContext&) {
</ins><span class="cx"> m_pageInspector->dispatchMessageFromWorker(messageCopy);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::confirmMessageFromWorkerObject(bool hasPendingActivity)
</span><span class="cx"> {
</span><del>- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext*) {
</del><ins>+ m_scriptExecutionContext->postTask([=] (ScriptExecutionContext&) {
</ins><span class="cx"> reportPendingActivityInternal(true, hasPendingActivity);
</span><span class="cx"> });
</span><span class="cx"> // Will execute reportPendingActivityInternal() on context's thread.
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::reportPendingActivity(bool hasPendingActivity)
</span><span class="cx"> {
</span><del>- m_scriptExecutionContext->postTask([=] (ScriptExecutionContext*) {
</del><ins>+ m_scriptExecutionContext->postTask([=] (ScriptExecutionContext&) {
</ins><span class="cx"> reportPendingActivityInternal(false, hasPendingActivity);
</span><span class="cx"> });
</span><span class="cx"> // Will execute reportPendingActivityInternal() on context's thread.
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerRunLoopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerRunLoop.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerRunLoop.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/workers/WorkerRunLoop.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> void WorkerRunLoop::Task::performTask(const WorkerRunLoop& runLoop, WorkerGlobalScope* context)
</span><span class="cx"> {
</span><span class="cx"> if ((!context->isClosing() && !runLoop.terminated()) || m_task.isCleanupTask())
</span><del>- m_task.performTask(context);
</del><ins>+ m_task.performTask(*context);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WorkerRunLoop::Task::Task(ScriptExecutionContext::Task task, const String& mode)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerScriptLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #include "WorkerScriptLoader.h"
</span><span class="cx">
</span><del>-#include "CrossThreadTask.h"
</del><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (170012 => 170013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.cpp 2014-06-16 16:42:31 UTC (rev 170012)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2014-06-16 16:45:59 UTC (rev 170013)
</span><span class="lines">@@ -213,8 +213,8 @@
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> DatabaseManager::manager().interruptAllDatabasesForContext(m_workerGlobalScope.get());
</span><span class="cx"> #endif
</span><del>- m_runLoop.postTaskAndTerminate({ ScriptExecutionContext::Task::CleanupTask, [] (ScriptExecutionContext* context ) {
- WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
</del><ins>+ m_runLoop.postTaskAndTerminate({ ScriptExecutionContext::Task::CleanupTask, [] (ScriptExecutionContext& context ) {
+ WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(&context);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> // FIXME: Should we stop the databases as part of stopActiveDOMObjects() below?
</span><span class="lines">@@ -238,8 +238,8 @@
</span><span class="cx">
</span><span class="cx"> // Stick a shutdown command at the end of the queue, so that we deal
</span><span class="cx"> // with all the cleanup tasks the databases post first.
</span><del>- workerGlobalScope->postTask({ ScriptExecutionContext::Task::CleanupTask, [] (ScriptExecutionContext* context) {
- WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
</del><ins>+ workerGlobalScope->postTask({ ScriptExecutionContext::Task::CleanupTask, [] (ScriptExecutionContext& context) {
+ WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(&context);
</ins><span class="cx"> // It's not safe to call clearScript until all the cleanup tasks posted by functions initiated by WorkerThreadShutdownStartTask have completed.
</span><span class="cx"> workerGlobalScope->clearScript();
</span><span class="cx"> } });
</span><span class="lines">@@ -255,7 +255,7 @@
</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*) {
</del><ins>+ workerThread->runLoop().postTask([] (ScriptExecutionContext&) {
</ins><span class="cx"> WTF::releaseFastMallocFreeMemory();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>