<!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>[175792] 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/175792">175792</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-11-09 09:25:21 -0800 (Sun, 09 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix various cases of incorrect cross-thread capture of non-thread-safe RefCounted
https://bugs.webkit.org/show_bug.cgi?id=138539
Reviewed by Alexey Proskuryakov.
* Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
(WebCore::WorkerThreadableWebSocketChannel::Peer::didConnect): Use StringCapture
instead of isolatedCopy, to avoid a problem where the original thread does its deref
after passing the string to the other thread.
(WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessage): Ditto.
(WebCore::WorkerThreadableWebSocketChannel::Peer::didClose): Ditto.
(WebCore::WorkerThreadableWebSocketChannel::Bridge::initialize): Ditto.
(WebCore::WorkerThreadableWebSocketChannel::Bridge::connect): Ditto.
(WebCore::WorkerThreadableWebSocketChannel::Bridge::send): Ditto.
(WebCore::WorkerThreadableWebSocketChannel::Bridge::close): Ditto.
(WebCore::WorkerThreadableWebSocketChannel::Bridge::fail): Ditto.
* dom/Document.cpp:
(WebCore::Document::addConsoleMessage): Pass a StringCapture when creating
AddConsoleMessageTask. Same reason as above, but in a different context.
(WebCore::Document::addMessage): Ditto.
* dom/ScriptExecutionContext.h: Changed AddConsoleMessageTask to take and
capture a StringCapture rather than a String, for the same reason as above.
* fileapi/AsyncFileStream.cpp:
(WebCore::AsyncFileStream::write): Use URLCapture instead of trying to use
StringCapture on a URL, since that doesn't preserve the validity flag.
* loader/WorkerThreadableLoader.cpp:
(WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge): Use StringCapture.
(WebCore::WorkerThreadableLoader::MainThreadBridge::didFail): Ditto.
(WebCore::WorkerThreadableLoader::MainThreadBridge::didFailAccessControlCheck): Ditto.
* platform/URL.h: Added URLCapture.
* platform/network/FormData.cpp:
(WebCore::appendBlobResolved): Remove incorrect pointless code that creates a new URL
from an existing URL with the ParsedURLString constructor.
* workers/DefaultSharedWorkerRepository.cpp: Fixed code that was trying to copy a URL
by copying a string to instead just use URL::copy. The comment claimed that URL::copy
is not thread safe, but that claim is incorrect.
(WebCore::SharedWorkerProxy::postExceptionToWorkerObject): Use StringCapture.
(WebCore::SharedWorkerProxy::postConsoleMessageToWorkerObject): Ditto.
(WebCore::DefaultSharedWorkerRepository::getProxy): Use URL::copy.
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::addConsoleMessage): Use StringCapture.
(WebCore::WorkerGlobalScope::addMessage): Ditto.
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::postExceptionToWorkerObject): Ditto.
(WebCore::WorkerMessagingProxy::postConsoleMessageToWorkerObject): Ditto.
(WebCore::WorkerMessagingProxy::sendMessageToInspector): Ditto.
(WebCore::WorkerMessagingProxy::postMessageToPageInspector): Ditto.
* workers/WorkerRunLoop.cpp:
(WebCore::WorkerRunLoop::postTaskAndTerminate): Make a Task with make_unique
rather than with Task::create. Removed an extra isolatedCopy, unneeded because
the Task constructor already does an isolatedCopy.
(WebCore::WorkerRunLoop::postTaskForMode): Ditto.
(WebCore::WorkerRunLoop::Task::create): Deleted.
* workers/WorkerRunLoop.h: Removed unneeded create function and explicit
public empty destructor.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCorefileapiAsyncFileStreamcpp">trunk/Source/WebCore/fileapi/AsyncFileStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderWorkerThreadableLoadercpp">trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLh">trunk/Source/WebCore/platform/URL.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkFormDatacpp">trunk/Source/WebCore/platform/network/FormData.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp">trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerRunLoopcpp">trunk/Source/WebCore/workers/WorkerRunLoop.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerRunLooph">trunk/Source/WebCore/workers/WorkerRunLoop.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/ChangeLog 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -1,3 +1,71 @@
</span><ins>+2014-11-09 Darin Adler <darin@apple.com>
+
+ Fix various cases of incorrect cross-thread capture of non-thread-safe RefCounted
+ https://bugs.webkit.org/show_bug.cgi?id=138539
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didConnect): Use StringCapture
+ instead of isolatedCopy, to avoid a problem where the original thread does its deref
+ after passing the string to the other thread.
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessage): Ditto.
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didClose): Ditto.
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::initialize): Ditto.
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::connect): Ditto.
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::send): Ditto.
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::close): Ditto.
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::fail): Ditto.
+
+ * dom/Document.cpp:
+ (WebCore::Document::addConsoleMessage): Pass a StringCapture when creating
+ AddConsoleMessageTask. Same reason as above, but in a different context.
+ (WebCore::Document::addMessage): Ditto.
+
+ * dom/ScriptExecutionContext.h: Changed AddConsoleMessageTask to take and
+ capture a StringCapture rather than a String, for the same reason as above.
+
+ * fileapi/AsyncFileStream.cpp:
+ (WebCore::AsyncFileStream::write): Use URLCapture instead of trying to use
+ StringCapture on a URL, since that doesn't preserve the validity flag.
+
+ * loader/WorkerThreadableLoader.cpp:
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::MainThreadBridge): Use StringCapture.
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::didFail): Ditto.
+ (WebCore::WorkerThreadableLoader::MainThreadBridge::didFailAccessControlCheck): Ditto.
+
+ * platform/URL.h: Added URLCapture.
+
+ * platform/network/FormData.cpp:
+ (WebCore::appendBlobResolved): Remove incorrect pointless code that creates a new URL
+ from an existing URL with the ParsedURLString constructor.
+
+ * workers/DefaultSharedWorkerRepository.cpp: Fixed code that was trying to copy a URL
+ by copying a string to instead just use URL::copy. The comment claimed that URL::copy
+ is not thread safe, but that claim is incorrect.
+ (WebCore::SharedWorkerProxy::postExceptionToWorkerObject): Use StringCapture.
+ (WebCore::SharedWorkerProxy::postConsoleMessageToWorkerObject): Ditto.
+ (WebCore::DefaultSharedWorkerRepository::getProxy): Use URL::copy.
+
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::addConsoleMessage): Use StringCapture.
+ (WebCore::WorkerGlobalScope::addMessage): Ditto.
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::postExceptionToWorkerObject): Ditto.
+ (WebCore::WorkerMessagingProxy::postConsoleMessageToWorkerObject): Ditto.
+ (WebCore::WorkerMessagingProxy::sendMessageToInspector): Ditto.
+ (WebCore::WorkerMessagingProxy::postMessageToPageInspector): Ditto.
+
+ * workers/WorkerRunLoop.cpp:
+ (WebCore::WorkerRunLoop::postTaskAndTerminate): Make a Task with make_unique
+ rather than with Task::create. Removed an extra isolatedCopy, unneeded because
+ the Task constructor already does an isolatedCopy.
+ (WebCore::WorkerRunLoop::postTaskForMode): Ditto.
+ (WebCore::WorkerRunLoop::Task::create): Deleted.
+
+ * workers/WorkerRunLoop.h: Removed unneeded create function and explicit
+ public empty destructor.
+
</ins><span class="cx"> 2014-11-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use is<>() / downcast<>() for HTMLCollection subclasses
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -266,12 +266,12 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- String subprotocolCopy = m_mainWebSocketChannel->subprotocol().isolatedCopy();
- String extensionsCopy = m_mainWebSocketChannel->extensions().isolatedCopy();
- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, subprotocolCopy, extensionsCopy] (ScriptExecutionContext& context) {
</del><ins>+ StringCapture capturedSubprotocol(m_mainWebSocketChannel->subprotocol());
+ StringCapture capturedExtensions(m_mainWebSocketChannel->extensions());
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedSubprotocol, capturedExtensions] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><del>- workerClientWrapper->setSubprotocol(subprotocolCopy);
- workerClientWrapper->setExtensions(extensionsCopy);
</del><ins>+ workerClientWrapper->setSubprotocol(capturedSubprotocol.string());
+ workerClientWrapper->setExtensions(capturedExtensions.string());
</ins><span class="cx"> workerClientWrapper->didConnect();
</span><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="lines">@@ -281,10 +281,10 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- String messageCopy = message.isolatedCopy();
- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, messageCopy] (ScriptExecutionContext& context) {
</del><ins>+ StringCapture capturedMessage(message);
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedMessage] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><del>- workerClientWrapper->didReceiveMessage(messageCopy);
</del><ins>+ workerClientWrapper->didReceiveMessage(capturedMessage.string());
</ins><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -327,11 +327,11 @@
</span><span class="cx"> m_mainWebSocketChannel = 0;
</span><span class="cx">
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- String reasonCopy = reason.isolatedCopy();
</del><ins>+ StringCapture capturedReason(reason);
</ins><span class="cx"> m_loaderProxy.postTaskForModeToWorkerGlobalScope(
</span><del>- [workerClientWrapper, unhandledBufferedAmount, closingHandshakeCompletion, code, reasonCopy] (ScriptExecutionContext& context) {
</del><ins>+ [workerClientWrapper, unhandledBufferedAmount, closingHandshakeCompletion, code, capturedReason] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><del>- workerClientWrapper->didClose(unhandledBufferedAmount, closingHandshakeCompletion, code, reasonCopy);
</del><ins>+ workerClientWrapper->didClose(unhandledBufferedAmount, closingHandshakeCompletion, code, capturedReason.string());
</ins><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -399,9 +399,9 @@
</span><span class="cx">
</span><span class="cx"> WorkerLoaderProxy* loaderProxy = &m_loaderProxy;
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- String taskModeCopy = m_taskMode.isolatedCopy();
- m_loaderProxy.postTaskToLoader([loaderProxy, workerClientWrapper, taskModeCopy] (ScriptExecutionContext& context) {
- mainThreadInitialize(context, loaderProxy, workerClientWrapper, taskModeCopy);
</del><ins>+ StringCapture capturedTaskMode(m_taskMode);
+ m_loaderProxy.postTaskToLoader([loaderProxy, workerClientWrapper, capturedTaskMode] (ScriptExecutionContext& context) {
+ mainThreadInitialize(context, loaderProxy, workerClientWrapper, capturedTaskMode.string());
</ins><span class="cx"> });
</span><span class="cx"> waitForMethodCompletion();
</span><span class="cx">
</span><span class="lines">@@ -418,14 +418,14 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Peer* peer = m_peer;
</span><del>- URL urlCopy = url.copy();
- String protocolCopy = protocol.isolatedCopy();
- m_loaderProxy.postTaskToLoader([peer, urlCopy, protocolCopy] (ScriptExecutionContext& context) {
</del><ins>+ URLCapture capturedURL(url);
+ StringCapture capturedProtocol(protocol);
+ m_loaderProxy.postTaskToLoader([peer, capturedURL, capturedProtocol] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT_UNUSED(context, context.isDocument());
</span><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><del>- peer->connect(urlCopy, protocolCopy);
</del><ins>+ peer->connect(capturedURL.url(), capturedProtocol.string());
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -436,13 +436,13 @@
</span><span class="cx"> setMethodNotCompleted();
</span><span class="cx">
</span><span class="cx"> Peer* peer = m_peer;
</span><del>- String messageCopy = message.isolatedCopy();
- m_loaderProxy.postTaskToLoader([peer, messageCopy] (ScriptExecutionContext& context) {
</del><ins>+ StringCapture capturedMessage(message);
+ m_loaderProxy.postTaskToLoader([peer, capturedMessage] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT_UNUSED(context, context.isDocument());
</span><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><del>- peer->send(messageCopy);
</del><ins>+ peer->send(capturedMessage.string());
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> Ref<Bridge> protect(*this);
</span><span class="lines">@@ -490,16 +490,15 @@
</span><span class="cx"> setMethodNotCompleted();
</span><span class="cx">
</span><span class="cx"> Peer* peer = m_peer;
</span><del>- URL urlCopy = binaryData.url().copy();
- String typeCopy = binaryData.type().isolatedCopy();
</del><ins>+ URLCapture capturedURL(binaryData.url());
+ StringCapture capturedType(binaryData.type());
</ins><span class="cx"> long long size = binaryData.size();
</span><del>- m_loaderProxy.postTaskToLoader([peer, urlCopy, typeCopy, size] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([peer, capturedURL, capturedType, size] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT_UNUSED(context, context.isDocument());
</span><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><del>- RefPtr<Blob> blob = Blob::deserialize(urlCopy, typeCopy, size);
- peer->send(*blob);
</del><ins>+ peer->send(*Blob::deserialize(capturedURL.url(), capturedType.string(), size));
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> Ref<Bridge> protect(*this);
</span><span class="lines">@@ -539,13 +538,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Peer* peer = m_peer;
</span><del>- String reasonCopy = reason.isolatedCopy();
- m_loaderProxy.postTaskToLoader([peer, code, reasonCopy] (ScriptExecutionContext& context) {
</del><ins>+ StringCapture capturedReason(reason);
+ m_loaderProxy.postTaskToLoader([peer, code, capturedReason] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT_UNUSED(context, context.isDocument());
</span><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><del>- peer->close(code, reasonCopy);
</del><ins>+ peer->close(code, capturedReason.string());
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -555,13 +554,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Peer* peer = m_peer;
</span><del>- String reasonCopy = reason.isolatedCopy();
- m_loaderProxy.postTaskToLoader([peer, reasonCopy] (ScriptExecutionContext& context) {
</del><ins>+ StringCapture capturedReason(reason);
+ m_loaderProxy.postTaskToLoader([peer, capturedReason] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT_UNUSED(context, context.isDocument());
</span><span class="cx"> ASSERT(peer);
</span><span class="cx">
</span><del>- peer->fail(reasonCopy);
</del><ins>+ peer->fail(capturedReason.string());
</ins><span class="cx"> });
</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 (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -4979,7 +4979,7 @@
</span><span class="cx"> void Document::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(source, level, message.isolatedCopy()));
</del><ins>+ postTask(AddConsoleMessageTask(source, level, StringCapture(message)));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4990,7 +4990,7 @@
</span><span class="cx"> void Document::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<Inspector::ScriptCallStack> callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(source, level, message));
</del><ins>+ postTask(AddConsoleMessageTask(source, level, StringCapture(message)));
</ins><span class="cx"> return;
</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 (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -184,9 +184,9 @@
</span><span class="cx"> protected:
</span><span class="cx"> class AddConsoleMessageTask : public Task {
</span><span class="cx"> public:
</span><del>- AddConsoleMessageTask(MessageSource source, MessageLevel level, const String& message)
- : Task([source, level, message] (ScriptExecutionContext& context) {
- context.addConsoleMessage(source, level, message);
</del><ins>+ AddConsoleMessageTask(MessageSource source, MessageLevel level, const StringCapture& message)
+ : Task([source, level, message](ScriptExecutionContext& context) {
+ context.addConsoleMessage(source, level, message.string());
</ins><span class="cx"> })
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiAsyncFileStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/AsyncFileStream.cpp (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/AsyncFileStream.cpp 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/fileapi/AsyncFileStream.cpp 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -192,10 +192,9 @@
</span><span class="cx">
</span><span class="cx"> void AsyncFileStream::write(const URL& blobURL, long long position, int length)
</span><span class="cx"> {
</span><del>- // FIXME: Would be more elegant to have a URLCapture for cases like this to avoid re-parsing the URL.
- StringCapture capturedURL(blobURL.string());
</del><ins>+ URLCapture capturedURL(blobURL);
</ins><span class="cx"> perform([capturedURL, position, length](FileStream& stream) -> std::function<void(FileStreamClient&)> {
</span><del>- int bytesWritten = stream.write(URL(ParsedURLString, capturedURL.string()), position, length);
</del><ins>+ int bytesWritten = stream.write(capturedURL.url(), position, length);
</ins><span class="cx"> return [bytesWritten](FileStreamClient& client) {
</span><span class="cx"> client.didWrite(bytesWritten);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderWorkerThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/loader/WorkerThreadableLoader.cpp 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -92,13 +92,13 @@
</span><span class="cx"> ASSERT(m_workerClientWrapper.get());
</span><span class="cx">
</span><span class="cx"> CrossThreadResourceRequestData* requestData = request.copyData().leakPtr();
</span><del>- String outgoingReferrerCopy = outgoingReferrer.isolatedCopy();
- m_loaderProxy.postTaskToLoader([this, requestData, options, outgoingReferrerCopy] (ScriptExecutionContext& context) {
</del><ins>+ StringCapture capturedOutgoingReferrer(outgoingReferrer);
+ m_loaderProxy.postTaskToLoader([this, requestData, options, capturedOutgoingReferrer](ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> Document& document = downcast<Document>(context);
</span><span class="cx">
</span><span class="cx"> OwnPtr<ResourceRequest> request = ResourceRequest::adopt(adoptPtr(requestData));
</span><del>- request->setHTTPReferrer(outgoingReferrerCopy);
</del><ins>+ request->setHTTPReferrer(capturedOutgoingReferrer.string());
</ins><span class="cx">
</span><span class="cx"> // FIXME: If the a site requests a local resource, then this will return a non-zero value but the sync path
</span><span class="cx"> // will return a 0 value. Either this should return 0 or the other code path should do a callback with
</span><span class="lines">@@ -193,20 +193,22 @@
</span><span class="cx"> void WorkerThreadableLoader::MainThreadBridge::didFail(const ResourceError& error)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- ResourceError errorCopy = error.copy();
- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, errorCopy] (ScriptExecutionContext& context) {
</del><ins>+ ResourceError* capturedError = new ResourceError(error.copy());
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedError] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><del>- workerClientWrapper->didFail(errorCopy);
</del><ins>+ workerClientWrapper->didFail(*capturedError);
+ delete capturedError;
</ins><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableLoader::MainThreadBridge::didFailAccessControlCheck(const ResourceError& error)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- ResourceError errorCopy = error.copy();
- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, errorCopy] (ScriptExecutionContext& context) {
</del><ins>+ ResourceError* capturedError = new ResourceError(error.copy());
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedError] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><del>- workerClientWrapper->didFailAccessControlCheck(errorCopy);
</del><ins>+ workerClientWrapper->didFailAccessControlCheck(*capturedError);
+ delete capturedError;
</ins><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.h (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.h 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/platform/URL.h 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -81,8 +81,9 @@
</span><span class="cx"> // standard String constructor.
</span><span class="cx">
</span><span class="cx"> // Makes a deep copy. Helpful only if you need to use a URL on another
</span><del>- // thread. Since the underlying StringImpl objects are immutable, there's
</del><ins>+ // thread. Since the underlying StringImpl objects are immutable, there's
</ins><span class="cx"> // no other reason to ever prefer copy() over plain old assignment.
</span><ins>+ // FIXME: Rename to isolatedCopy to match String.
</ins><span class="cx"> URL copy() const;
</span><span class="cx">
</span><span class="cx"> bool isNull() const;
</span><span class="lines">@@ -254,6 +255,24 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String encodeWithURLEscapeSequences(const String&);
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+WEBCORE_EXPORT void enableURLSchemeCanonicalization(bool);
+#endif
+
+// Like StringCapture, but for URLs.
+class URLCapture {
+public:
+ explicit URLCapture(const URL&);
+ explicit URLCapture(URL&&);
+ URLCapture(const URLCapture&);
+ const URL& url() const;
+ URL releaseURL();
+
+private:
+ void operator=(const URLCapture&) = delete;
+ URL m_URL;
+};
+
</ins><span class="cx"> // Inlines.
</span><span class="cx">
</span><span class="cx"> inline bool operator==(const URL& a, const URL& b)
</span><span class="lines">@@ -344,10 +363,31 @@
</span><span class="cx"> return m_pathAfterLastSlash;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-WEBCORE_EXPORT void enableURLSchemeCanonicalization(bool);
-#endif
</del><ins>+inline URLCapture::URLCapture(const URL& url)
+ : m_URL(url)
+{
+}
</ins><span class="cx">
</span><ins>+inline URLCapture::URLCapture(URL&& url)
+ : m_URL(url)
+{
+}
+
+inline URLCapture::URLCapture(const URLCapture& other)
+ : m_URL(other.m_URL.copy())
+{
+}
+
+inline const URL& URLCapture::url() const
+{
+ return m_URL;
+}
+
+inline URL URLCapture::releaseURL()
+{
+ return WTF::move(m_URL);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkFormDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/FormData.cpp (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/FormData.cpp 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/platform/network/FormData.cpp 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx"> LOG_ERROR("Tried to resolve a blob without a usable registry");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- BlobData* blobData = static_cast<BlobRegistryImpl&>(blobRegistry()).getBlobDataFromURL(URL(ParsedURLString, url));
</del><ins>+ BlobData* blobData = static_cast<BlobRegistryImpl&>(blobRegistry()).getBlobDataFromURL(url);
</ins><span class="cx"> if (!blobData) {
</span><span class="cx"> LOG_ERROR("Could not get blob data from a registry");
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx">
</span><span class="cx"> #include "DefaultSharedWorkerRepository.h"
</span><span class="cx">
</span><del>-#include "ActiveDOMObject.h"
</del><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="lines">@@ -44,10 +43,8 @@
</span><span class="cx"> #include "PageGroup.h"
</span><span class="cx"> #include "PlatformStrategies.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><del>-#include "SecurityOriginHash.h"
</del><span class="cx"> #include "SharedWorker.h"
</span><span class="cx"> #include "SharedWorkerGlobalScope.h"
</span><del>-#include "SharedWorkerRepository.h"
</del><span class="cx"> #include "SharedWorkerStrategy.h"
</span><span class="cx"> #include "SharedWorkerThread.h"
</span><span class="cx"> #include "WorkerLoaderProxy.h"
</span><span class="lines">@@ -55,42 +52,33 @@
</span><span class="cx"> #include "WorkerScriptLoader.h"
</span><span class="cx"> #include "WorkerScriptLoaderClient.h"
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><del>-#include <mutex>
-#include <wtf/HashSet.h>
</del><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/Threading.h>
-#include <wtf/text/WTFString.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class SharedWorkerProxy : public ThreadSafeRefCounted<SharedWorkerProxy>, public WorkerLoaderProxy, public WorkerReportingProxy {
</del><ins>+class SharedWorkerProxy final : public ThreadSafeRefCounted<SharedWorkerProxy>, public WorkerLoaderProxy, public WorkerReportingProxy {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<SharedWorkerProxy> create(const String& name, const URL& url, PassRefPtr<SecurityOrigin> origin) { return adoptRef(new SharedWorkerProxy(name, url, origin)); }
</span><span class="cx">
</span><span class="cx"> void setThread(PassRefPtr<SharedWorkerThread> thread) { m_thread = thread; }
</span><span class="cx"> SharedWorkerThread* thread() { return m_thread.get(); }
</span><span class="cx"> bool isClosing() const { return m_closing; }
</span><del>- URL url() const
- {
- // Don't use m_url.copy() because it isn't a threadsafe method.
- return URL(ParsedURLString, m_url.string().isolatedCopy());
- }
-
</del><ins>+ URL url() const { return m_url.copy(); }
</ins><span class="cx"> String name() const { return m_name.isolatedCopy(); }
</span><span class="cx"> bool matches(const String& name, PassRefPtr<SecurityOrigin> origin, const URL& urlToMatch) const;
</span><span class="cx">
</span><span class="cx"> // WorkerLoaderProxy
</span><del>- virtual void postTaskToLoader(ScriptExecutionContext::Task);
- virtual bool postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task, const String&);
</del><ins>+ virtual void postTaskToLoader(ScriptExecutionContext::Task) override;
+ virtual bool postTaskForModeToWorkerGlobalScope(ScriptExecutionContext::Task, const String&) override;
</ins><span class="cx">
</span><span class="cx"> // WorkerReportingProxy
</span><del>- virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL);
- virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, int columnNumber, const String& sourceURL);
</del><ins>+ virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL) override;
+ virtual void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, int columnNumber, const String& sourceURL) override;
</ins><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- virtual void postMessageToPageInspector(const String&);
</del><ins>+ virtual void postMessageToPageInspector(const String&) override;
</ins><span class="cx"> #endif
</span><del>- virtual void workerGlobalScopeClosed();
- virtual void workerGlobalScopeDestroyed();
</del><ins>+ virtual void workerGlobalScopeClosed() override;
+ virtual void workerGlobalScopeDestroyed() override;
</ins><span class="cx">
</span><span class="cx"> // Updates the list of the worker's documents, per section 4.5 of the WebWorkers spec.
</span><span class="cx"> void addToWorkerDocuments(ScriptExecutionContext*);
</span><span class="lines">@@ -181,24 +169,22 @@
</span><span class="cx"> void SharedWorkerProxy::postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><span class="cx"> MutexLocker lock(m_workerDocumentsLock);
</span><del>- String errorMessageCopy = errorMessage.isolatedCopy();
- String sourceURLCopy = sourceURL.isolatedCopy();
-
</del><ins>+ StringCapture capturedErrorMessage(errorMessage);
+ StringCapture capturedSourceURL(sourceURL);
</ins><span class="cx"> for (auto& document : m_workerDocuments)
</span><del>- document->postTask([errorMessageCopy, lineNumber, columnNumber, sourceURLCopy] (ScriptExecutionContext& context) {
- context.reportException(errorMessageCopy, lineNumber, columnNumber, sourceURLCopy, nullptr);
</del><ins>+ document->postTask([capturedErrorMessage, lineNumber, columnNumber, capturedSourceURL] (ScriptExecutionContext& context) {
+ context.reportException(capturedErrorMessage.string(), lineNumber, columnNumber, capturedSourceURL.string(), nullptr);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SharedWorkerProxy::postConsoleMessageToWorkerObject(MessageSource source, MessageLevel level, const String& message, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><span class="cx"> MutexLocker lock(m_workerDocumentsLock);
</span><del>- String messageCopy = message.isolatedCopy();
- String sourceURLCopy = sourceURL.isolatedCopy();
-
</del><ins>+ StringCapture capturedMessage(message);
+ StringCapture capturedSourceURL(sourceURL);
</ins><span class="cx"> for (auto& document : m_workerDocuments)
</span><del>- document->postTask([source, level, messageCopy, sourceURLCopy, lineNumber, columnNumber] (ScriptExecutionContext& context) {
- context.addConsoleMessage(source, level, messageCopy, sourceURLCopy, lineNumber, columnNumber);
</del><ins>+ document->postTask([source, level, capturedMessage, capturedSourceURL, lineNumber, columnNumber] (ScriptExecutionContext& context) {
+ context.addConsoleMessage(source, level, capturedMessage.string(), capturedSourceURL.string(), lineNumber, columnNumber);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -417,7 +403,7 @@
</span><span class="cx"> // Look for an existing worker, and create one if it doesn't exist.
</span><span class="cx"> // Items in the cache are freed on another thread, so do a threadsafe copy of the URL before creating the origin,
</span><span class="cx"> // to make sure no references to external strings linger.
</span><del>- RefPtr<SecurityOrigin> origin = SecurityOrigin::create(URL(ParsedURLString, url.string().isolatedCopy()));
</del><ins>+ RefPtr<SecurityOrigin> origin = SecurityOrigin::create(url.copy());
</ins><span class="cx"> for (unsigned i = 0; i < m_proxies.size(); i++) {
</span><span class="cx"> if (!m_proxies[i]->isClosing() && m_proxies[i]->matches(name, origin, url))
</span><span class="cx"> return m_proxies[i];
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> void WorkerGlobalScope::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(source, level, message));
</del><ins>+ postTask(AddConsoleMessageTask(source, level, StringCapture(message)));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> void WorkerGlobalScope::addMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack> callStack, JSC::ExecState* state, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><span class="cx"> if (!isContextThread()) {
</span><del>- postTask(AddConsoleMessageTask(source, level, message));
</del><ins>+ postTask(AddConsoleMessageTask(source, level, StringCapture(message)));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -146,9 +146,9 @@
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><del>- String errorMessageCopy = errorMessage.isolatedCopy();
- String sourceURLCopy = sourceURL.isolatedCopy();
- m_scriptExecutionContext->postTask([this, errorMessageCopy, sourceURLCopy, lineNumber, columnNumber] (ScriptExecutionContext& context) {
</del><ins>+ StringCapture capturedErrorMessage(errorMessage);
+ StringCapture capturedSourceURL(sourceURL);
+ m_scriptExecutionContext->postTask([this, capturedErrorMessage, capturedSourceURL, lineNumber, columnNumber] (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">@@ -156,20 +156,20 @@
</span><span class="cx"> // We don't bother checking the askedToTerminate() flag here, because exceptions should *always* be reported even if the thread is terminated.
</span><span class="cx"> // This is intentionally different than the behavior in MessageWorkerTask, because terminated workers no longer deliver messages (section 4.6 of the WebWorker spec), but they do report exceptions.
</span><span class="cx">
</span><del>- bool errorHandled = !workerObject->dispatchEvent(ErrorEvent::create(errorMessageCopy, sourceURLCopy, lineNumber, columnNumber));
</del><ins>+ bool errorHandled = !workerObject->dispatchEvent(ErrorEvent::create(capturedErrorMessage.string(), capturedSourceURL.string(), lineNumber, columnNumber));
</ins><span class="cx"> if (!errorHandled)
</span><del>- context.reportException(errorMessageCopy, lineNumber, columnNumber, sourceURLCopy, 0);
</del><ins>+ context.reportException(capturedErrorMessage.string(), lineNumber, columnNumber, capturedSourceURL.string(), 0);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerMessagingProxy::postConsoleMessageToWorkerObject(MessageSource source, MessageLevel level, const String& message, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><del>- String messageCopy = message.isolatedCopy();
- String sourceURLCopy = sourceURL.isolatedCopy();
- m_scriptExecutionContext->postTask([this, source, level, messageCopy, sourceURLCopy, lineNumber, columnNumber] (ScriptExecutionContext& context) {
</del><ins>+ StringCapture capturedMessage(message);
+ StringCapture capturedSourceURL(sourceURL);
+ m_scriptExecutionContext->postTask([this, source, level, capturedMessage, capturedSourceURL, lineNumber, columnNumber] (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, capturedMessage.string(), capturedSourceURL.string(), lineNumber, columnNumber);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -242,9 +242,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return;
</span><del>- String messageCopy = message.isolatedCopy();
- m_workerThread->runLoop().postTaskForMode([messageCopy] (ScriptExecutionContext& context) {
- downcast<WorkerGlobalScope>(context).workerInspectorController().dispatchMessageFromFrontend(messageCopy);
</del><ins>+ StringCapture capturedMessage(message);
+ m_workerThread->runLoop().postTaskForMode([capturedMessage] (ScriptExecutionContext& context) {
+ downcast<WorkerGlobalScope>(context).workerInspectorController().dispatchMessageFromFrontend(capturedMessage.string());
</ins><span class="cx"> }, WorkerDebuggerAgent::debuggerTaskMode);
</span><span class="cx"> WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(m_workerThread.get());
</span><span class="cx"> }
</span><span class="lines">@@ -294,9 +294,9 @@
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> void WorkerMessagingProxy::postMessageToPageInspector(const String& message)
</span><span class="cx"> {
</span><del>- String messageCopy = message.isolatedCopy();
- m_scriptExecutionContext->postTask([this, messageCopy] (ScriptExecutionContext&) {
- m_pageInspector->dispatchMessageFromWorker(messageCopy);
</del><ins>+ StringCapture capturedMessage(message);
+ m_scriptExecutionContext->postTask([this, capturedMessage] (ScriptExecutionContext&) {
+ m_pageInspector->dispatchMessageFromWorker(capturedMessage.string());
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerRunLoopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerRunLoop.cpp (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerRunLoop.cpp 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/workers/WorkerRunLoop.cpp 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -199,19 +199,14 @@
</span><span class="cx">
</span><span class="cx"> void WorkerRunLoop::postTaskAndTerminate(ScriptExecutionContext::Task task)
</span><span class="cx"> {
</span><del>- m_messageQueue.appendAndKill(Task::create(WTF::move(task), defaultMode().isolatedCopy()));
</del><ins>+ m_messageQueue.appendAndKill(std::make_unique<Task>(WTF::move(task), defaultMode()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerRunLoop::postTaskForMode(ScriptExecutionContext::Task task, const String& mode)
</span><span class="cx"> {
</span><del>- m_messageQueue.append(Task::create(WTF::move(task), mode.isolatedCopy()));
</del><ins>+ m_messageQueue.append(std::make_unique<Task>(WTF::move(task), mode));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<WorkerRunLoop::Task> WorkerRunLoop::Task::create(ScriptExecutionContext::Task task, const String& mode)
-{
- return std::unique_ptr<Task>(new Task(WTF::move(task), mode));
-}
-
</del><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></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerRunLoop.h (175791 => 175792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerRunLoop.h 2014-11-09 17:21:51 UTC (rev 175791)
+++ trunk/Source/WebCore/workers/WorkerRunLoop.h 2014-11-09 17:25:21 UTC (rev 175792)
</span><span class="lines">@@ -68,14 +68,11 @@
</span><span class="cx"> class Task {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(Task); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static std::unique_ptr<Task> create(ScriptExecutionContext::Task, const String& mode);
- ~Task() { }
</del><ins>+ Task(ScriptExecutionContext::Task, const String& mode);
</ins><span class="cx"> const String& mode() const { return m_mode; }
</span><span class="cx"> void performTask(const WorkerRunLoop&, WorkerGlobalScope*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Task(ScriptExecutionContext::Task, const String& mode);
-
</del><span class="cx"> ScriptExecutionContext::Task m_task;
</span><span class="cx"> String m_mode;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>