Index: third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp |
diff --git a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp |
index 2bf0b6a7c43959ab557534ba4c9c6f0979910288..4e04afc26eb181303b5ef89c0863f7f5304de831 100644 |
--- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp |
+++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp |
@@ -9,11 +9,10 @@ |
#include "core/workers/WorkerThreadStartupData.h" |
#include "modules/EventTargetModules.h" |
#include "modules/compositorworker/CompositorWorkerThread.h" |
-#include <memory> |
namespace blink { |
-CompositorWorkerGlobalScope* CompositorWorkerGlobalScope::create(CompositorWorkerThread* thread, std::unique_ptr<WorkerThreadStartupData> startupData, double timeOrigin) |
+CompositorWorkerGlobalScope* CompositorWorkerGlobalScope::create(CompositorWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData, double timeOrigin) |
{ |
// Note: startupData is finalized on return. After the relevant parts has been |
// passed along to the created 'context'. |
@@ -23,7 +22,7 @@ CompositorWorkerGlobalScope* CompositorWorkerGlobalScope::create(CompositorWorke |
return context; |
} |
-CompositorWorkerGlobalScope::CompositorWorkerGlobalScope(const KURL& url, const String& userAgent, CompositorWorkerThread* thread, double timeOrigin, std::unique_ptr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, WorkerClients* workerClients) |
+CompositorWorkerGlobalScope::CompositorWorkerGlobalScope(const KURL& url, const String& userAgent, CompositorWorkerThread* thread, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, WorkerClients* workerClients) |
: WorkerGlobalScope(url, userAgent, thread, timeOrigin, std::move(starterOriginPrivilegeData), workerClients) |
, m_executingAnimationFrameCallbacks(false) |
, m_callbackCollection(this) |
@@ -49,7 +48,7 @@ const AtomicString& CompositorWorkerGlobalScope::interfaceName() const |
void CompositorWorkerGlobalScope::postMessage(ExecutionContext* executionContext, PassRefPtr<SerializedScriptValue> message, const MessagePortArray& ports, ExceptionState& exceptionState) |
{ |
// Disentangle the port in preparation for sending it to the remote context. |
- std::unique_ptr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(executionContext, ports, exceptionState); |
+ OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(executionContext, ports, exceptionState); |
if (exceptionState.hadException()) |
return; |
thread()->workerObjectProxy().postMessageToWorkerObject(message, std::move(channels)); |