<!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>[201543] 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/201543">201543</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-31 21:49:24 -0700 (Tue, 31 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize lambda captures in WorkerThreadableWebSocketChannel
https://bugs.webkit.org/show_bug.cgi?id=158246
Reviewed by Brady Eidson.
Modernize lambda captures in WorkerThreadableWebSocketChannel and drop
legacy URLCapture as it is no longer needed / used.
* Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
(WebCore::WorkerThreadableWebSocketChannel::Peer::send):
(WebCore::WorkerThreadableWebSocketChannel::Peer::bufferedAmount):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didConnect):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessage):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didUpdateBufferedAmount):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didStartClosingHandshake):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didClose):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessageError):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::mainThreadInitialize):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::initialize):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::connect):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::send):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::bufferedAmount):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::close):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::fail):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::disconnect):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::suspend):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::resume):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::setMethodNotCompleted): Deleted.
(WebCore::WorkerThreadableWebSocketChannel::Bridge::waitForMethodCompletion): Deleted.
* Modules/websockets/WorkerThreadableWebSocketChannel.h:
* platform/URL.h:
(WebCore::operator==): Deleted.</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="#trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh">trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h</a></li>
<li><a href="#trunkSourceWebCoreplatformURLh">trunk/Source/WebCore/platform/URL.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201542 => 201543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-01 04:30:57 UTC (rev 201542)
+++ trunk/Source/WebCore/ChangeLog 2016-06-01 04:49:24 UTC (rev 201543)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-05-31 Chris Dumez <cdumez@apple.com>
+
+ Modernize lambda captures in WorkerThreadableWebSocketChannel
+ https://bugs.webkit.org/show_bug.cgi?id=158246
+
+ Reviewed by Brady Eidson.
+
+ Modernize lambda captures in WorkerThreadableWebSocketChannel and drop
+ legacy URLCapture as it is no longer needed / used.
+
+ * Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::send):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::bufferedAmount):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didConnect):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessage):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didUpdateBufferedAmount):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didStartClosingHandshake):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didClose):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessageError):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::mainThreadInitialize):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::initialize):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::connect):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::send):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::bufferedAmount):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::close):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::fail):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::disconnect):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::suspend):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::resume):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::setMethodNotCompleted): Deleted.
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::waitForMethodCompletion): Deleted.
+ * Modules/websockets/WorkerThreadableWebSocketChannel.h:
+ * platform/URL.h:
+ (WebCore::operator==): Deleted.
+
</ins><span class="cx"> 2016-05-31 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: ReportExtraMemoryCost IDL attribute should also be used to generate estimatedSize method
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp (201542 => 201543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2016-06-01 04:30:57 UTC (rev 201542)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2016-06-01 04:49:24 UTC (rev 201543)
</span><span class="lines">@@ -143,8 +143,8 @@
</span><span class="cx"> m_bridge->resume();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WorkerThreadableWebSocketChannel::Peer::Peer(PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode)
- : m_workerClientWrapper(clientWrapper)
</del><ins>+WorkerThreadableWebSocketChannel::Peer::Peer(RefPtr<ThreadableWebSocketChannelClientWrapper>&& clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode)
+ : m_workerClientWrapper(WTFMove(clientWrapper))
</ins><span class="cx"> , m_loaderProxy(loaderProxy)
</span><span class="cx"> , m_mainWebSocketChannel(WebSocketChannel::create(downcast<Document>(context), this))
</span><span class="cx"> , m_taskMode(taskMode)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx">
</span><span class="cx"> ThreadableWebSocketChannel::SendResult sendRequestResult = m_mainWebSocketChannel->send(message);
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, sendRequestResult] (ScriptExecutionContext&) {
</del><ins>+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper = WTFMove(workerClientWrapper), sendRequestResult] (ScriptExecutionContext&) {
</ins><span class="cx"> workerClientWrapper->setSendRequestResult(sendRequestResult);
</span><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx">
</span><span class="cx"> ThreadableWebSocketChannel::SendResult sendRequestResult = m_mainWebSocketChannel->send(binaryData, 0, binaryData.byteLength());
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, sendRequestResult] (ScriptExecutionContext&) {
</del><ins>+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper = WTFMove(workerClientWrapper), sendRequestResult] (ScriptExecutionContext&) {
</ins><span class="cx"> workerClientWrapper->setSendRequestResult(sendRequestResult);
</span><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx">
</span><span class="cx"> ThreadableWebSocketChannel::SendResult sendRequestResult = m_mainWebSocketChannel->send(binaryData);
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, sendRequestResult] (ScriptExecutionContext&) {
</del><ins>+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper = WTFMove(workerClientWrapper), sendRequestResult] (ScriptExecutionContext&) {
</ins><span class="cx"> workerClientWrapper->setSendRequestResult(sendRequestResult);
</span><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><span class="cx"> unsigned long bufferedAmount = m_mainWebSocketChannel->bufferedAmount();
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, bufferedAmount] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper = WTFMove(workerClientWrapper), bufferedAmount] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><span class="cx"> workerClientWrapper->setBufferedAmount(bufferedAmount);
</span><span class="cx"> }, m_taskMode);
</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>- StringCapture capturedSubprotocol(m_mainWebSocketChannel->subprotocol());
- StringCapture capturedExtensions(m_mainWebSocketChannel->extensions());
- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedSubprotocol, capturedExtensions] (ScriptExecutionContext& context) {
</del><ins>+ String subprotocol = m_mainWebSocketChannel->subprotocol();
+ String extensions = m_mainWebSocketChannel->extensions();
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper = WTFMove(workerClientWrapper), subprotocol = subprotocol.isolatedCopy(), extensions = extensions.isolatedCopy()] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><del>- workerClientWrapper->setSubprotocol(capturedSubprotocol.string());
- workerClientWrapper->setExtensions(capturedExtensions.string());
</del><ins>+ workerClientWrapper->setSubprotocol(subprotocol);
+ workerClientWrapper->setExtensions(extensions);
</ins><span class="cx"> workerClientWrapper->didConnect();
</span><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="lines">@@ -281,10 +281,9 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- StringCapture capturedMessage(message);
- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedMessage] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper = WTFMove(workerClientWrapper), message = message.isolatedCopy()] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><del>- workerClientWrapper->didReceiveMessage(capturedMessage.string());
</del><ins>+ workerClientWrapper->didReceiveMessage(message);
</ins><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -293,11 +292,9 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- Vector<uint8_t>* capturedData = new Vector<uint8_t>(WTFMove(binaryData));
- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, capturedData] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper = WTFMove(workerClientWrapper), binaryData = WTFMove(binaryData)] (ScriptExecutionContext& context) mutable {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><del>- workerClientWrapper->didReceiveBinaryData(WTFMove(*capturedData));
- delete capturedData;
</del><ins>+ workerClientWrapper->didReceiveBinaryData(WTFMove(binaryData));
</ins><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -306,7 +303,7 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper, bufferedAmount] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper = WTFMove(workerClientWrapper), bufferedAmount] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><span class="cx"> workerClientWrapper->didUpdateBufferedAmount(bufferedAmount);
</span><span class="cx"> }, m_taskMode);
</span><span class="lines">@@ -317,7 +314,7 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper = WTFMove(workerClientWrapper)] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><span class="cx"> workerClientWrapper->didStartClosingHandshake();
</span><span class="cx"> }, m_taskMode);
</span><span class="lines">@@ -329,11 +326,9 @@
</span><span class="cx"> m_mainWebSocketChannel = nullptr;
</span><span class="cx">
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- StringCapture capturedReason(reason);
- m_loaderProxy.postTaskForModeToWorkerGlobalScope(
- [workerClientWrapper, unhandledBufferedAmount, closingHandshakeCompletion, code, capturedReason] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper = WTFMove(workerClientWrapper), unhandledBufferedAmount, closingHandshakeCompletion, code, reason = reason.isolatedCopy()] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><del>- workerClientWrapper->didClose(unhandledBufferedAmount, closingHandshakeCompletion, code, capturedReason.string());
</del><ins>+ workerClientWrapper->didClose(unhandledBufferedAmount, closingHandshakeCompletion, code, reason);
</ins><span class="cx"> }, m_taskMode);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -342,7 +337,7 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx">
</span><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([workerClientWrapper = WTFMove(workerClientWrapper)] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><span class="cx"> workerClientWrapper->didReceiveMessageError();
</span><span class="cx"> }, m_taskMode);
</span><span class="lines">@@ -363,34 +358,31 @@
</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, RefPtr<ThreadableWebSocketChannelClientWrapper>&& passedClientWrapper, const String& taskMode)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT_UNUSED(context, context.isDocument());
</span><span class="cx">
</span><del>- RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper = prpClientWrapper;
</del><ins>+ RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper = WTFMove(passedClientWrapper);
</ins><span class="cx">
</span><del>- Peer* peerPtr = Peer::create(clientWrapper, *loaderProxy, &context, taskMode);
</del><ins>+ auto peer = std::make_unique<Peer>(clientWrapper.copyRef(), *loaderProxy, &context, taskMode);
</ins><span class="cx"> bool sent = loaderProxy->postTaskForModeToWorkerGlobalScope({
</span><span class="cx"> ScriptExecutionContext::Task::CleanupTask,
</span><del>- [clientWrapper, loaderProxy, peerPtr] (ScriptExecutionContext& context) {
</del><ins>+ [clientWrapper, loaderProxy, peer = WTFMove(peer)] (ScriptExecutionContext& context) mutable {
</ins><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><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><del>- loaderProxy->postTaskToLoader([peerPtr] (ScriptExecutionContext& context) {
</del><ins>+ loaderProxy->postTaskToLoader([peer = WTFMove(peer)] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT_UNUSED(context, context.isDocument());
</span><del>- delete peerPtr;
</del><span class="cx"> });
</span><span class="cx"> } else
</span><del>- clientWrapper->didCreateWebSocketChannel(peerPtr);
</del><ins>+ clientWrapper->didCreateWebSocketChannel(peer.release());
</ins><span class="cx"> }
</span><span class="cx"> }, taskMode);
</span><span class="cx">
</span><del>- if (!sent) {
</del><ins>+ if (!sent)
</ins><span class="cx"> clientWrapper->clearPeer();
</span><del>- delete peerPtr;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Bridge::initialize()
</span><span class="lines">@@ -399,11 +391,9 @@
</span><span class="cx"> setMethodNotCompleted();
</span><span class="cx"> Ref<Bridge> protectedThis(*this);
</span><span class="cx">
</span><del>- WorkerLoaderProxy* loaderProxy = &m_loaderProxy;
</del><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</span><del>- StringCapture capturedTaskMode(m_taskMode);
- m_loaderProxy.postTaskToLoader([loaderProxy, workerClientWrapper, capturedTaskMode] (ScriptExecutionContext& context) {
- mainThreadInitialize(context, loaderProxy, workerClientWrapper, capturedTaskMode.string());
</del><ins>+ m_loaderProxy.postTaskToLoader([loaderProxy = &m_loaderProxy, workerClientWrapper = WTFMove(workerClientWrapper), taskMode = m_taskMode.isolatedCopy()] (ScriptExecutionContext& context) mutable {
+ mainThreadInitialize(context, loaderProxy, WTFMove(workerClientWrapper), taskMode);
</ins><span class="cx"> });
</span><span class="cx"> waitForMethodCompletion();
</span><span class="cx">
</span><span class="lines">@@ -419,15 +409,12 @@
</span><span class="cx"> if (!m_peer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Peer* peer = m_peer;
- URLCapture capturedURL(url);
- StringCapture capturedProtocol(protocol);
- m_loaderProxy.postTaskToLoader([peer, capturedURL, capturedProtocol] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([peer = m_peer, url = url.isolatedCopy(), protocol = protocol.isolatedCopy()] (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(capturedURL.url(), capturedProtocol.string());
</del><ins>+ peer->connect(url, protocol);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -437,14 +424,12 @@
</span><span class="cx"> return ThreadableWebSocketChannel::SendFail;
</span><span class="cx"> setMethodNotCompleted();
</span><span class="cx">
</span><del>- Peer* peer = m_peer;
- StringCapture capturedMessage(message);
- m_loaderProxy.postTaskToLoader([peer, capturedMessage] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([peer = m_peer, message = message.isolatedCopy()] (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(capturedMessage.string());
</del><ins>+ peer->send(message);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> Ref<Bridge> protectedThis(*this);
</span><span class="lines">@@ -461,20 +446,18 @@
</span><span class="cx"> return ThreadableWebSocketChannel::SendFail;
</span><span class="cx">
</span><span class="cx"> // ArrayBuffer isn't thread-safe, hence the content of ArrayBuffer is copied into Vector<char>.
</span><del>- Vector<char>* dataPtr = std::make_unique<Vector<char>>(byteLength).release();
</del><ins>+ Vector<char> data(byteLength);
</ins><span class="cx"> if (binaryData.byteLength())
</span><del>- memcpy(dataPtr->data(), static_cast<const char*>(binaryData.data()) + byteOffset, byteLength);
</del><ins>+ memcpy(data.data(), static_cast<const char*>(binaryData.data()) + byteOffset, byteLength);
</ins><span class="cx"> setMethodNotCompleted();
</span><span class="cx">
</span><del>- Peer* peer = m_peer;
- m_loaderProxy.postTaskToLoader([peer, dataPtr] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([peer = m_peer, data = WTFMove(data)] (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>- std::unique_ptr<Vector<char>> data(dataPtr);
- RefPtr<ArrayBuffer> arrayBuffer = ArrayBuffer::create(data->data(), data->size());
- peer->send(*arrayBuffer);
</del><ins>+ auto arrayBuffer = ArrayBuffer::create(data.data(), data.size());
+ peer->send(arrayBuffer);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> Ref<Bridge> protectedThis(*this);
</span><span class="lines">@@ -491,16 +474,12 @@
</span><span class="cx"> return ThreadableWebSocketChannel::SendFail;
</span><span class="cx"> setMethodNotCompleted();
</span><span class="cx">
</span><del>- Peer* peer = m_peer;
- URLCapture capturedURL(binaryData.url());
- StringCapture capturedType(binaryData.type());
- long long size = binaryData.size();
- m_loaderProxy.postTaskToLoader([peer, capturedURL, capturedType, size] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([peer = m_peer, url = binaryData.url().isolatedCopy(), type = binaryData.type().isolatedCopy(), size = binaryData.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>- peer->send(Blob::deserialize(capturedURL.url(), capturedType.string(), size, { }));
</del><ins>+ peer->send(Blob::deserialize(url, type, size, { }));
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> Ref<Bridge> protectedThis(*this);
</span><span class="lines">@@ -517,8 +496,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> setMethodNotCompleted();
</span><span class="cx">
</span><del>- Peer* peer = m_peer;
- m_loaderProxy.postTaskToLoader([peer] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([peer = m_peer] (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="lines">@@ -539,14 +517,12 @@
</span><span class="cx"> if (!m_peer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Peer* peer = m_peer;
- StringCapture capturedReason(reason);
- m_loaderProxy.postTaskToLoader([peer, code, capturedReason] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([peer = m_peer, code, reason = reason.isolatedCopy()] (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, capturedReason.string());
</del><ins>+ peer->close(code, reason);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -555,14 +531,12 @@
</span><span class="cx"> if (!m_peer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Peer* peer = m_peer;
- StringCapture capturedReason(reason);
- m_loaderProxy.postTaskToLoader([peer, capturedReason] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([peer = m_peer, reason = reason.isolatedCopy()] (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(capturedReason.string());
</del><ins>+ peer->fail(reason);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -570,8 +544,7 @@
</span><span class="cx"> {
</span><span class="cx"> clearClientWrapper();
</span><span class="cx"> if (m_peer) {
</span><del>- Peer* peer = m_peer;
- m_loaderProxy.postTaskToLoader([peer] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([peer = m_peer] (ScriptExecutionContext& context) {
</ins><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT_UNUSED(context, context.isDocument());
</span><span class="cx"> delete peer;
</span><span class="lines">@@ -586,8 +559,7 @@
</span><span class="cx"> if (!m_peer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Peer* peer = m_peer;
- m_loaderProxy.postTaskToLoader([peer] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([peer = m_peer] (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="lines">@@ -601,8 +573,7 @@
</span><span class="cx"> if (!m_peer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Peer* peer = m_peer;
- m_loaderProxy.postTaskToLoader([peer] (ScriptExecutionContext& context) {
</del><ins>+ m_loaderProxy.postTaskToLoader([peer = m_peer] (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></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h (201542 => 201543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2016-06-01 04:30:57 UTC (rev 201542)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2016-06-01 04:49:24 UTC (rev 201543)
</span><span class="lines">@@ -80,10 +80,7 @@
</span><span class="cx"> class Peer : public WebSocketChannelClient {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(Peer); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static Peer* create(PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode)
- {
- return new Peer(clientWrapper, loaderProxy, context, taskMode);
- }
</del><ins>+ Peer(RefPtr<ThreadableWebSocketChannelClientWrapper>&&, WorkerLoaderProxy&, ScriptExecutionContext*, const String& taskMode);
</ins><span class="cx"> ~Peer();
</span><span class="cx">
</span><span class="cx"> void connect(const URL&, const String& protocol);
</span><span class="lines">@@ -107,8 +104,6 @@
</span><span class="cx"> void didReceiveMessageError() override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Peer(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ScriptExecutionContext*, const String& taskMode);
-
</del><span class="cx"> RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;
</span><span class="cx"> WorkerLoaderProxy& m_loaderProxy;
</span><span class="cx"> RefPtr<ThreadableWebSocketChannel> m_mainWebSocketChannel;
</span><span class="lines">@@ -152,7 +147,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*, RefPtr<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></pre></div>
<a id="trunkSourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.h (201542 => 201543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.h 2016-06-01 04:30:57 UTC (rev 201542)
+++ trunk/Source/WebCore/platform/URL.h 2016-06-01 04:49:24 UTC (rev 201543)
</span><span class="lines">@@ -330,20 +330,6 @@
</span><span class="cx"> WEBCORE_EXPORT void enableURLSchemeCanonicalization(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// 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;
-};
-
</del><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">@@ -434,31 +420,6 @@
</span><span class="cx"> return m_pathAfterLastSlash;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline URLCapture::URLCapture(const URL& url)
- : m_URL(url)
-{
-}
-
-inline URLCapture::URLCapture(URL&& url)
- : m_URL(url)
-{
-}
-
-inline URLCapture::URLCapture(const URLCapture& other)
- : m_URL(other.m_URL.isolatedCopy())
-{
-}
-
-inline const URL& URLCapture::url() const
-{
- return m_URL;
-}
-
-inline URL URLCapture::releaseURL()
-{
- return WTFMove(m_URL);
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span></span></pre>
</div>
</div>
</body>
</html>