| 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 e68c9a31986aa39c1290c0153b420f675cce1856..5fe50aa4966de6f4ae36735c9f524798d6ad1d70 100644
|
| --- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp
|
| +++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp
|
| @@ -6,8 +6,8 @@
|
|
|
| #include "bindings/core/v8/V8GCController.h"
|
| #include "bindings/core/v8/V8Initializer.h"
|
| +#include "core/workers/InProcessWorkerObjectProxy.h"
|
| #include "core/workers/WorkerBackingThread.h"
|
| -#include "core/workers/WorkerObjectProxy.h"
|
| #include "core/workers/WorkerThreadStartupData.h"
|
| #include "modules/compositorworker/CompositorWorkerGlobalScope.h"
|
| #include "platform/ThreadSafeFunctional.h"
|
| @@ -42,14 +42,14 @@ private:
|
|
|
| } // namespace
|
|
|
| -PassOwnPtr<CompositorWorkerThread> CompositorWorkerThread::create(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin)
|
| +PassOwnPtr<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));
|
| }
|
|
|
| -CompositorWorkerThread::CompositorWorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin)
|
| +CompositorWorkerThread::CompositorWorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, InProcessWorkerObjectProxy& workerObjectProxy, double timeOrigin)
|
| : WorkerThread(workerLoaderProxy, workerObjectProxy)
|
| , m_workerObjectProxy(workerObjectProxy)
|
| , m_timeOrigin(timeOrigin)
|
|
|