Diff
Modified: trunk/Source/WebCore/ChangeLog (201674 => 201675)
--- 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)
@@ -1,3 +1,25 @@
+2016-06-03 Chris Dumez <cdu...@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:
+
2016-06-03 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r201663.
Modified: trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp (201674 => 201675)
--- 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)
@@ -63,21 +63,21 @@
return DedicatedWorkerGlobalScopeEventTargetInterfaceType;
}
-void DedicatedWorkerGlobalScope::postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort* port, ExceptionCode& ec)
+void DedicatedWorkerGlobalScope::postMessage(RefPtr<SerializedScriptValue>&& message, MessagePort* port, ExceptionCode& ec)
{
MessagePortArray ports;
if (port)
ports.append(port);
- postMessage(message, &ports, ec);
+ postMessage(WTFMove(message), &ports, ec);
}
-void DedicatedWorkerGlobalScope::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionCode& ec)
+void DedicatedWorkerGlobalScope::postMessage(RefPtr<SerializedScriptValue>&& message, const MessagePortArray* ports, ExceptionCode& ec)
{
// Disentangle the port in preparation for sending it to the remote context.
- std::unique_ptr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(ports, ec);
+ auto channels = MessagePort::disentanglePorts(ports, ec);
if (ec)
return;
- thread().workerObjectProxy().postMessageToWorkerObject(message, WTFMove(channels));
+ thread().workerObjectProxy().postMessageToWorkerObject(WTFMove(message), WTFMove(channels));
}
void DedicatedWorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionCode& ec)
Modified: trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h (201674 => 201675)
--- 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)
@@ -53,9 +53,9 @@
// EventTarget
EventTargetInterface eventTargetInterface() const override;
- void postMessage(PassRefPtr<SerializedScriptValue>, const MessagePortArray*, ExceptionCode&);
+ void postMessage(RefPtr<SerializedScriptValue>&&, const MessagePortArray*, ExceptionCode&);
// Needed for Objective-C bindings (see bug 28774).
- void postMessage(PassRefPtr<SerializedScriptValue>, MessagePort*, ExceptionCode&);
+ void postMessage(RefPtr<SerializedScriptValue>&&, MessagePort*, ExceptionCode&);
DedicatedWorkerThread& thread();
Modified: trunk/Source/WebCore/workers/Worker.cpp (201674 => 201675)
--- 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)
@@ -107,21 +107,21 @@
m_contextProxy->workerObjectDestroyed();
}
-void Worker::postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort* port, ExceptionCode& ec)
+void Worker::postMessage(RefPtr<SerializedScriptValue>&& message, MessagePort* port, ExceptionCode& ec)
{
MessagePortArray ports;
if (port)
ports.append(port);
- postMessage(message, &ports, ec);
+ postMessage(WTFMove(message), &ports, ec);
}
-void Worker::postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray* ports, ExceptionCode& ec)
+void Worker::postMessage(RefPtr<SerializedScriptValue>&& message, const MessagePortArray* ports, ExceptionCode& ec)
{
// Disentangle the port in preparation for sending it to the remote context.
- std::unique_ptr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(ports, ec);
+ auto channels = MessagePort::disentanglePorts(ports, ec);
if (ec)
return;
- m_contextProxy->postMessageToWorkerGlobalScope(message, WTFMove(channels));
+ m_contextProxy->postMessageToWorkerGlobalScope(WTFMove(message), WTFMove(channels));
}
void Worker::terminate()
Modified: trunk/Source/WebCore/workers/Worker.h (201674 => 201675)
--- 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)
@@ -55,9 +55,9 @@
EventTargetInterface eventTargetInterface() const override { return WorkerEventTargetInterfaceType; }
- void postMessage(PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, ExceptionCode&);
+ void postMessage(RefPtr<SerializedScriptValue>&& message, const MessagePortArray*, ExceptionCode&);
// Needed for Objective-C bindings (see bug 28774).
- void postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort*, ExceptionCode&);
+ void postMessage(RefPtr<SerializedScriptValue>&& message, MessagePort*, ExceptionCode&);
void terminate();
Modified: trunk/Source/WebCore/workers/WorkerEventQueue.cpp (201674 => 201675)
--- 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)
@@ -88,10 +88,10 @@
if (m_isClosed)
return false;
- EventDispatcher* eventDispatcherPtr = new EventDispatcher(event.copyRef(), *this);
- m_eventDispatcherMap.add(event.ptr(), eventDispatcherPtr);
- m_scriptExecutionContext.postTask([eventDispatcherPtr] (ScriptExecutionContext&) {
- std::unique_ptr<EventDispatcher> eventDispatcher(eventDispatcherPtr);
+ 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&) {
eventDispatcher->dispatch();
});
Modified: trunk/Source/WebCore/workers/WorkerGlobalScopeProxy.h (201674 => 201675)
--- 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)
@@ -53,7 +53,7 @@
virtual void terminateWorkerGlobalScope() = 0;
- virtual void postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue>, std::unique_ptr<MessagePortChannelArray>) = 0;
+ virtual void postMessageToWorkerGlobalScope(RefPtr<SerializedScriptValue>&&, std::unique_ptr<MessagePortChannelArray>) = 0;
virtual bool hasPendingActivity() const = 0;
Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (201674 => 201675)
--- 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)
@@ -88,30 +88,28 @@
thread->start();
}
-void WorkerMessagingProxy::postMessageToWorkerObject(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels)
+void WorkerMessagingProxy::postMessageToWorkerObject(RefPtr<SerializedScriptValue>&& message, std::unique_ptr<MessagePortChannelArray> channels)
{
- MessagePortChannelArray* channelsPtr = channels.release();
- m_scriptExecutionContext->postTask([this, channelsPtr, message] (ScriptExecutionContext& context) {
+ m_scriptExecutionContext->postTask([this, channels = WTFMove(channels), message = WTFMove(message)] (ScriptExecutionContext& context) mutable {
Worker* workerObject = this->workerObject();
if (!workerObject || askedToTerminate())
return;
- std::unique_ptr<MessagePortArray> ports = MessagePort::entanglePorts(context, std::unique_ptr<MessagePortChannelArray>(channelsPtr));
- workerObject->dispatchEvent(MessageEvent::create(WTFMove(ports), message));
+ auto ports = MessagePort::entanglePorts(context, WTFMove(channels));
+ workerObject->dispatchEvent(MessageEvent::create(WTFMove(ports), WTFMove(message)));
});
}
-void WorkerMessagingProxy::postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue> message, std::unique_ptr<MessagePortChannelArray> channels)
+void WorkerMessagingProxy::postMessageToWorkerGlobalScope(RefPtr<SerializedScriptValue>&& message, std::unique_ptr<MessagePortChannelArray> channels)
{
if (m_askedToTerminate)
return;
- MessagePortChannelArray* channelsPtr = channels.release();
- ScriptExecutionContext::Task task([channelsPtr, message] (ScriptExecutionContext& scriptContext) {
+ ScriptExecutionContext::Task task([channels = WTFMove(channels), message = WTFMove(message)] (ScriptExecutionContext& scriptContext) mutable {
ASSERT_WITH_SECURITY_IMPLICATION(scriptContext.isWorkerGlobalScope());
- DedicatedWorkerGlobalScope& context = static_cast<DedicatedWorkerGlobalScope&>(scriptContext);
- std::unique_ptr<MessagePortArray> ports = MessagePort::entanglePorts(scriptContext, std::unique_ptr<MessagePortChannelArray>(channelsPtr));
- context.dispatchEvent(MessageEvent::create(WTFMove(ports), message));
+ auto& context = static_cast<DedicatedWorkerGlobalScope&>(scriptContext);
+ auto ports = MessagePort::entanglePorts(scriptContext, WTFMove(channels));
+ context.dispatchEvent(MessageEvent::create(WTFMove(ports), WTFMove(message)));
context.thread().workerObjectProxy().confirmMessageFromWorkerObject(context.hasPendingActivity());
});
Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.h (201674 => 201675)
--- 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)
@@ -54,14 +54,14 @@
// (Only use these methods in the worker object thread.)
void startWorkerGlobalScope(const URL& scriptURL, const String& userAgent, const String& sourceCode, const ContentSecurityPolicyResponseHeaders&, bool shouldBypassMainWorldContentSecurityPolicy, WorkerThreadStartMode) override;
void terminateWorkerGlobalScope() override;
- void postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue>, std::unique_ptr<MessagePortChannelArray>) override;
+ void postMessageToWorkerGlobalScope(RefPtr<SerializedScriptValue>&&, std::unique_ptr<MessagePortChannelArray>) override;
bool hasPendingActivity() const override;
void workerObjectDestroyed() override;
void notifyNetworkStateChange(bool isOnline) override;
// Implementations of WorkerObjectProxy.
// (Only use these methods in the worker context thread.)
- void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, std::unique_ptr<MessagePortChannelArray>) override;
+ void postMessageToWorkerObject(RefPtr<SerializedScriptValue>&&, std::unique_ptr<MessagePortChannelArray>) override;
void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL) override;
void postConsoleMessageToWorkerObject(MessageSource, MessageLevel, const String& message, int lineNumber, int columnNumber, const String& sourceURL) override;
void confirmMessageFromWorkerObject(bool hasPendingActivity) override;
Modified: trunk/Source/WebCore/workers/WorkerObjectProxy.h (201674 => 201675)
--- 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)
@@ -42,7 +42,7 @@
// A proxy to talk to the worker object.
class WorkerObjectProxy : public WorkerReportingProxy {
public:
- virtual void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, std::unique_ptr<MessagePortChannelArray>) = 0;
+ virtual void postMessageToWorkerObject(RefPtr<SerializedScriptValue>&&, std::unique_ptr<MessagePortChannelArray>) = 0;
virtual void confirmMessageFromWorkerObject(bool hasPendingActivity) = 0;
virtual void reportPendingActivity(bool hasPendingActivity) = 0;
Modified: trunk/Source/WebKit/ChangeLog (201674 => 201675)
--- 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)
@@ -1,3 +1,13 @@
+2016-06-03 Chris Dumez <cdu...@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):
+
2016-06-03 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r201663.
Modified: trunk/Source/WebKit/Storage/StorageTracker.cpp (201674 => 201675)
--- 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)
@@ -501,9 +501,8 @@
m_originSet.remove(originId);
}
- String originIdCopy = originId.isolatedCopy();
- m_thread->dispatch([this, originIdCopy] {
- syncDeleteOrigin(originIdCopy);
+ m_thread->dispatch([this, originId = originId.isolatedCopy()] {
+ syncDeleteOrigin(originId);
});
}
