| Index: third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp
|
| diff --git a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp
|
| index de797adf0bd59754688ba70c3dbda8872bb9bee5..45736806e457700f10364c5be672575adc443697 100644
|
| --- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp
|
| +++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp
|
| @@ -16,6 +16,8 @@
|
| #include "platform/WebThreadSupportingGC.h"
|
| #include "public/platform/Platform.h"
|
| #include "wtf/Assertions.h"
|
| +#include "wtf/PtrUtil.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -60,7 +62,7 @@ public:
|
| WorkerBackingThread* thread() { return m_thread.get(); }
|
|
|
| private:
|
| - BackingThreadHolder(PassOwnPtr<WorkerBackingThread> useBackingThread = nullptr)
|
| + BackingThreadHolder(std::unique_ptr<WorkerBackingThread> useBackingThread = nullptr)
|
| : m_thread(useBackingThread ? std::move(useBackingThread) : WorkerBackingThread::create(Platform::current()->compositorThread()))
|
| {
|
| DCHECK(isMainThread());
|
| @@ -95,7 +97,7 @@ private:
|
| doneEvent->signal();
|
| }
|
|
|
| - OwnPtr<WorkerBackingThread> m_thread;
|
| + std::unique_ptr<WorkerBackingThread> m_thread;
|
| bool m_initialized = false;
|
|
|
| static BackingThreadHolder* s_instance;
|
| @@ -105,11 +107,11 @@ BackingThreadHolder* BackingThreadHolder::s_instance = nullptr;
|
|
|
| } // namespace
|
|
|
| -PassOwnPtr<CompositorWorkerThread> CompositorWorkerThread::create(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, InProcessWorkerObjectProxy& workerObjectProxy, double timeOrigin)
|
| +std::unique_ptr<CompositorWorkerThread> CompositorWorkerThread::create(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, InProcessWorkerObjectProxy& workerObjectProxy, double timeOrigin)
|
| {
|
| TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerThread::create");
|
| ASSERT(isMainThread());
|
| - return adoptPtr(new CompositorWorkerThread(workerLoaderProxy, workerObjectProxy, timeOrigin));
|
| + return wrapUnique(new CompositorWorkerThread(workerLoaderProxy, workerObjectProxy, timeOrigin));
|
| }
|
|
|
| CompositorWorkerThread::CompositorWorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, InProcessWorkerObjectProxy& workerObjectProxy, double timeOrigin)
|
| @@ -128,7 +130,7 @@ WorkerBackingThread& CompositorWorkerThread::workerBackingThread()
|
| return *BackingThreadHolder::instance().thread();
|
| }
|
|
|
| -WorkerGlobalScope*CompositorWorkerThread::createWorkerGlobalScope(PassOwnPtr<WorkerThreadStartupData> startupData)
|
| +WorkerGlobalScope*CompositorWorkerThread::createWorkerGlobalScope(std::unique_ptr<WorkerThreadStartupData> startupData)
|
| {
|
| TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerThread::createWorkerGlobalScope");
|
| return CompositorWorkerGlobalScope::create(this, std::move(startupData), m_timeOrigin);
|
|
|