<!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>[201675] trunk/Source</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/201675">201675</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-03 18:31:47 -0700 (Fri, 03 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize a few more lambda captures
https://bugs.webkit.org/show_bug.cgi?id=158370
Reviewed by Brady Eidson.
Source/WebCore:
* workers/DedicatedWorkerGlobalScope.cpp:
(WebCore::DedicatedWorkerGlobalScope::postMessage):
* workers/DedicatedWorkerGlobalScope.h:
* workers/Worker.cpp:
(WebCore::Worker::postMessage):
* workers/Worker.h:
* workers/WorkerEventQueue.cpp:
(WebCore::WorkerEventQueue::enqueueEvent):
* workers/WorkerGlobalScopeProxy.h:
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::postMessageToWorkerObject):
(WebCore::WorkerMessagingProxy::postMessageToWorkerGlobalScope):
* workers/WorkerMessagingProxy.h:
* workers/WorkerObjectProxy.h:
Source/WebKit:
* Storage/StorageTracker.cpp:
(WebCore::StorageTracker::deleteOrigin):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreworkersDedicatedWorkerGlobalScopecpp">trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersDedicatedWorkerGlobalScopeh">trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkercpp">trunk/Source/WebCore/workers/Worker.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerh">trunk/Source/WebCore/workers/Worker.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerEventQueuecpp">trunk/Source/WebCore/workers/WorkerEventQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeProxyh">trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxyh">trunk/Source/WebCore/workers/WorkerMessagingProxy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerObjectProxyh">trunk/Source/WebCore/workers/WorkerObjectProxy.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitStorageStorageTrackercpp">trunk/Source/WebKit/Storage/StorageTracker.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201674 => 201675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-04 01:08:27 UTC (rev 201674)
+++ trunk/Source/WebCore/ChangeLog 2016-06-04 01:31:47 UTC (rev 201675)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-06-03 Chris Dumez <cdumez@apple.com>
+
+ Modernize a few more lambda captures
+ https://bugs.webkit.org/show_bug.cgi?id=158370
+
+ Reviewed by Brady Eidson.
+
+ * workers/DedicatedWorkerGlobalScope.cpp:
+ (WebCore::DedicatedWorkerGlobalScope::postMessage):
+ * workers/DedicatedWorkerGlobalScope.h:
+ * workers/Worker.cpp:
+ (WebCore::Worker::postMessage):
+ * workers/Worker.h:
+ * workers/WorkerEventQueue.cpp:
+ (WebCore::WorkerEventQueue::enqueueEvent):
+ * workers/WorkerGlobalScopeProxy.h:
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::postMessageToWorkerObject):
+ (WebCore::WorkerMessagingProxy::postMessageToWorkerGlobalScope):
+ * workers/WorkerMessagingProxy.h:
+ * workers/WorkerObjectProxy.h:
+
</ins><span class="cx"> 2016-06-03 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201663.
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDedicatedWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp (201674 => 201675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp 2016-06-04 01:08:27 UTC (rev 201674)
+++ trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp 2016-06-04 01:31:47 UTC (rev 201675)
</span><span class="lines">@@ -63,21 +63,21 @@
</span><span class="cx"> return DedicatedWorkerGlobalScopeEventTargetInterfaceType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DedicatedWorkerGlobalScope::postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort* port, ExceptionCode& ec)
</del><ins>+void DedicatedWorkerGlobalScope::postMessage(RefPtr<SerializedScriptValue>&& message, MessagePort* port, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> MessagePortArray ports;
</span><span class="cx"> if (port)
</span><span class="cx"> ports.append(port);
</span><del>- postMessage(message, &ports, ec);
</del><ins>+ postMessage(WTFMove(message), &ports, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void DedicatedWorkerGlobalScope::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionCode& ec)
</del><ins>+void DedicatedWorkerGlobalScope::postMessage(RefPtr<SerializedScriptValue>&& message, const MessagePortArray* ports, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> // Disentangle the port in preparation for sending it to the remote context.
</span><del>- std::unique_ptr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(ports, ec);
</del><ins>+ auto channels = MessagePort::disentanglePorts(ports, ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><del>- thread().workerObjectProxy().postMessageToWorkerObject(message, WTFMove(channels));
</del><ins>+ thread().workerObjectProxy().postMessageToWorkerObject(WTFMove(message), WTFMove(channels));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DedicatedWorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDedicatedWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h (201674 => 201675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h 2016-06-04 01:08:27 UTC (rev 201674)
+++ trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h 2016-06-04 01:31:47 UTC (rev 201675)
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx"> // EventTarget
</span><span class="cx"> EventTargetInterface eventTargetInterface() const override;
</span><span class="cx">
</span><del>- void postMessage(PassRefPtr<SerializedScriptValue>, const MessagePortArray*, ExceptionCode&);
</del><ins>+ void postMessage(RefPtr<SerializedScriptValue>&&, const MessagePortArray*, ExceptionCode&);
</ins><span class="cx"> // Needed for Objective-C bindings (see bug 28774).
</span><del>- void postMessage(PassRefPtr<SerializedScriptValue>, MessagePort*, ExceptionCode&);
</del><ins>+ void postMessage(RefPtr<SerializedScriptValue>&&, MessagePort*, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> DedicatedWorkerThread& thread();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/Worker.cpp (201674 => 201675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/Worker.cpp 2016-06-04 01:08:27 UTC (rev 201674)
+++ trunk/Source/WebCore/workers/Worker.cpp 2016-06-04 01:31:47 UTC (rev 201675)
</span><span class="lines">@@ -107,21 +107,21 @@
</span><span class="cx"> m_contextProxy->workerObjectDestroyed();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Worker::postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort* port, ExceptionCode& ec)
</del><ins>+void Worker::postMessage(RefPtr<SerializedScriptValue>&& message, MessagePort* port, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> MessagePortArray ports;
</span><span class="cx"> if (port)
</span><span class="cx"> ports.append(port);
</span><del>- postMessage(message, &ports, ec);
</del><ins>+ postMessage(WTFMove(message), &ports, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Worker::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionCode& ec)
</del><ins>+void Worker::postMessage(RefPtr<SerializedScriptValue>&& message, const MessagePortArray* ports, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> // Disentangle the port in preparation for sending it to the remote context.
</span><del>- std::unique_ptr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(ports, ec);
</del><ins>+ auto channels = MessagePort::disentanglePorts(ports, ec);
</ins><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><del>- m_contextProxy->postMessageToWorkerGlobalScope(message, WTFMove(channels));
</del><ins>+ m_contextProxy->postMessageToWorkerGlobalScope(WTFMove(message), WTFMove(channels));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Worker::terminate()
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/Worker.h (201674 => 201675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/Worker.h 2016-06-04 01:08:27 UTC (rev 201674)
+++ trunk/Source/WebCore/workers/Worker.h 2016-06-04 01:31:47 UTC (rev 201675)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx">
</span><span class="cx"> EventTargetInterface eventTargetInterface() const override { return WorkerEventTargetInterfaceType; }
</span><span class="cx">
</span><del>- void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, ExceptionCode&);
</del><ins>+ void postMessage(RefPtr<SerializedScriptValue>&& message, const MessagePortArray*, ExceptionCode&);
</ins><span class="cx"> // Needed for Objective-C bindings (see bug 28774).
</span><del>- void postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort*, ExceptionCode&);
</del><ins>+ void postMessage(RefPtr<SerializedScriptValue>&& message, MessagePort*, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> void terminate();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerEventQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerEventQueue.cpp (201674 => 201675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerEventQueue.cpp 2016-06-04 01:08:27 UTC (rev 201674)
+++ trunk/Source/WebCore/workers/WorkerEventQueue.cpp 2016-06-04 01:31:47 UTC (rev 201675)
</span><span class="lines">@@ -88,10 +88,10 @@
</span><span class="cx"> if (m_isClosed)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- EventDispatcher* eventDispatcherPtr = new EventDispatcher(event.copyRef(), *this);
- m_eventDispatcherMap.add(event.ptr(), eventDispatcherPtr);
- m_scriptExecutionContext.postTask([eventDispatcherPtr] (ScriptExecutionContext&) {
- std::unique_ptr<EventDispatcher> eventDispatcher(eventDispatcherPtr);
</del><ins>+ auto* eventPtr = event.ptr();
+ auto eventDispatcher = std::make_unique<EventDispatcher>(WTFMove(event), *this);
+ m_eventDispatcherMap.add(eventPtr, eventDispatcher.get());
+ m_scriptExecutionContext.postTask([eventDispatcher = WTFMove(eventDispatcher)] (ScriptExecutionContext&) {
</ins><span class="cx"> eventDispatcher->dispatch();
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h (201674 => 201675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h 2016-06-04 01:08:27 UTC (rev 201674)
+++ trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h 2016-06-04 01:31:47 UTC (rev 201675)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void terminateWorkerGlobalScope() = 0;
</span><span class="cx">
</span><del>- virtual void postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue>, std::unique_ptr<MessagePortChannelArray>) = 0;
</del><ins>+ virtual void postMessageToWorkerGlobalScope(RefPtr<SerializedScriptValue>&&, std::unique_ptr<MessagePortChannelArray>) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual bool hasPendingActivity() const = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (201674 => 201675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2016-06-04 01:08:27 UTC (rev 201674)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2016-06-04 01:31:47 UTC (rev 201675)
</span><span class="lines">@@ -88,30 +88,28 @@
</span><span class="cx"> thread->start();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerMessagingProxy::postMessageToWorkerObject(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels)
</del><ins>+void WorkerMessagingProxy::postMessageToWorkerObject(RefPtr<SerializedScriptValue>&& message, std::unique_ptr<MessagePortChannelArray> channels)
</ins><span class="cx"> {
</span><del>- MessagePortChannelArray* channelsPtr = channels.release();
- m_scriptExecutionContext->postTask([this, channelsPtr, message] (ScriptExecutionContext& context) {
</del><ins>+ m_scriptExecutionContext->postTask([this, channels = WTFMove(channels), message = WTFMove(message)] (ScriptExecutionContext& context) mutable {
</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));
- workerObject->dispatchEvent(MessageEvent::create(WTFMove(ports), message));
</del><ins>+ auto ports = MessagePort::entanglePorts(context, WTFMove(channels));
+ workerObject->dispatchEvent(MessageEvent::create(WTFMove(ports), WTFMove(message)));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerMessagingProxy::postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels)
</del><ins>+void WorkerMessagingProxy::postMessageToWorkerGlobalScope(RefPtr<SerializedScriptValue>&& message, std::unique_ptr<MessagePortChannelArray> channels)
</ins><span class="cx"> {
</span><span class="cx"> if (m_askedToTerminate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- MessagePortChannelArray* channelsPtr = channels.release();
- ScriptExecutionContext::Task task([channelsPtr, message] (ScriptExecutionContext& scriptContext) {
</del><ins>+ ScriptExecutionContext::Task task([channels = WTFMove(channels), message = WTFMove(message)] (ScriptExecutionContext& scriptContext) mutable {
</ins><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(scriptContext.isWorkerGlobalScope());
</span><del>- DedicatedWorkerGlobalScope& context = static_cast<DedicatedWorkerGlobalScope&>(scriptContext);
- std::unique_ptr<MessagePortArray> ports = MessagePort::entanglePorts(scriptContext, std::unique_ptr<MessagePortChannelArray>(channelsPtr));
- context.dispatchEvent(MessageEvent::create(WTFMove(ports), message));
</del><ins>+ auto& context = static_cast<DedicatedWorkerGlobalScope&>(scriptContext);
+ auto ports = MessagePort::entanglePorts(scriptContext, WTFMove(channels));
+ context.dispatchEvent(MessageEvent::create(WTFMove(ports), WTFMove(message)));
</ins><span class="cx"> context.thread().workerObjectProxy().confirmMessageFromWorkerObject(context.hasPendingActivity());
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.h (201674 => 201675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2016-06-04 01:08:27 UTC (rev 201674)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2016-06-04 01:31:47 UTC (rev 201675)
</span><span class="lines">@@ -54,14 +54,14 @@
</span><span class="cx"> // (Only use these methods in the worker object thread.)
</span><span class="cx"> void startWorkerGlobalScope(const URL& scriptURL, const String& userAgent, const String& sourceCode, const ContentSecurityPolicyResponseHeaders&, bool shouldBypassMainWorldContentSecurityPolicy, WorkerThreadStartMode) override;
</span><span class="cx"> void terminateWorkerGlobalScope() override;
</span><del>- void postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue>, std::unique_ptr<MessagePortChannelArray>) override;
</del><ins>+ void postMessageToWorkerGlobalScope(RefPtr<SerializedScriptValue>&&, std::unique_ptr<MessagePortChannelArray>) override;
</ins><span class="cx"> bool hasPendingActivity() const override;
</span><span class="cx"> void workerObjectDestroyed() override;
</span><span class="cx"> void notifyNetworkStateChange(bool isOnline) override;
</span><span class="cx">
</span><span class="cx"> // Implementations of WorkerObjectProxy.
</span><span class="cx"> // (Only use these methods in the worker context thread.)
</span><del>- void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, std::unique_ptr<MessagePortChannelArray>) override;
</del><ins>+ void postMessageToWorkerObject(RefPtr<SerializedScriptValue>&&, std::unique_ptr<MessagePortChannelArray>) override;
</ins><span class="cx"> void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL) override;
</span><span class="cx"> void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, int columnNumber, const String& sourceURL) override;
</span><span class="cx"> void confirmMessageFromWorkerObject(bool hasPendingActivity) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerObjectProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerObjectProxy.h (201674 => 201675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerObjectProxy.h 2016-06-04 01:08:27 UTC (rev 201674)
+++ trunk/Source/WebCore/workers/WorkerObjectProxy.h 2016-06-04 01:31:47 UTC (rev 201675)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> // A proxy to talk to the worker object.
</span><span class="cx"> class WorkerObjectProxy : public WorkerReportingProxy {
</span><span class="cx"> public:
</span><del>- virtual void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, std::unique_ptr<MessagePortChannelArray>) = 0;
</del><ins>+ virtual void postMessageToWorkerObject(RefPtr<SerializedScriptValue>&&, std::unique_ptr<MessagePortChannelArray>) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void confirmMessageFromWorkerObject(bool hasPendingActivity) = 0;
</span><span class="cx"> virtual void reportPendingActivity(bool hasPendingActivity) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (201674 => 201675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-06-04 01:08:27 UTC (rev 201674)
+++ trunk/Source/WebKit/ChangeLog 2016-06-04 01:31:47 UTC (rev 201675)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-06-03 Chris Dumez <cdumez@apple.com>
+
+ Modernize a few more lambda captures
+ https://bugs.webkit.org/show_bug.cgi?id=158370
+
+ Reviewed by Brady Eidson.
+
+ * Storage/StorageTracker.cpp:
+ (WebCore::StorageTracker::deleteOrigin):
+
</ins><span class="cx"> 2016-06-03 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201663.
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageTracker.cpp (201674 => 201675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageTracker.cpp 2016-06-04 01:08:27 UTC (rev 201674)
+++ trunk/Source/WebKit/Storage/StorageTracker.cpp 2016-06-04 01:31:47 UTC (rev 201675)
</span><span class="lines">@@ -501,9 +501,8 @@
</span><span class="cx"> m_originSet.remove(originId);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- String originIdCopy = originId.isolatedCopy();
- m_thread->dispatch([this, originIdCopy] {
- syncDeleteOrigin(originIdCopy);
</del><ins>+ m_thread->dispatch([this, originId = originId.isolatedCopy()] {
+ syncDeleteOrigin(originId);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>