| Index: Source/modules/compositorworker/CompositorWorkerThread.cpp
|
| diff --git a/Source/modules/compositorworker/CompositorWorkerThread.cpp b/Source/modules/compositorworker/CompositorWorkerThread.cpp
|
| index 32ceb1dbe3f3ff435c050709e29d4e2a0375fb57..6535dd9af0213a2b4234557dfcb691a047718128 100644
|
| --- a/Source/modules/compositorworker/CompositorWorkerThread.cpp
|
| +++ b/Source/modules/compositorworker/CompositorWorkerThread.cpp
|
| @@ -7,20 +7,20 @@
|
|
|
| #include "bindings/core/v8/V8Initializer.h"
|
| #include "core/workers/WorkerObjectProxy.h"
|
| -#include "core/workers/WorkerThreadStartupData.h"
|
| +#include "core/workers/WorkerScriptStartupData.h"
|
| #include "modules/compositorworker/CompositorWorkerGlobalScope.h"
|
| #include "public/platform/Platform.h"
|
|
|
| namespace blink {
|
|
|
| -PassRefPtr<CompositorWorkerThread> CompositorWorkerThread::create(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin, PassOwnPtr<WorkerThreadStartupData> startupData)
|
| +PassRefPtr<CompositorWorkerThread> CompositorWorkerThread::create(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin, PassOwnPtr<WorkerScriptStartupData> startupData)
|
| {
|
| ASSERT(isMainThread());
|
| return adoptRef(new CompositorWorkerThread(workerLoaderProxy, workerObjectProxy, timeOrigin, startupData));
|
| }
|
|
|
| -CompositorWorkerThread::CompositorWorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin, PassOwnPtr<WorkerThreadStartupData> startupData)
|
| - : WorkerThread(workerLoaderProxy, workerObjectProxy, startupData)
|
| +CompositorWorkerThread::CompositorWorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin, PassOwnPtr<WorkerScriptStartupData> startupData)
|
| + : WorkerScript(workerLoaderProxy, workerObjectProxy, startupData)
|
| , m_workerObjectProxy(workerObjectProxy)
|
| , m_timeOrigin(timeOrigin)
|
| {
|
| @@ -30,7 +30,7 @@ CompositorWorkerThread::~CompositorWorkerThread()
|
| {
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<WorkerGlobalScope> CompositorWorkerThread::createWorkerGlobalScope(PassOwnPtr<WorkerThreadStartupData> startupData)
|
| +PassRefPtrWillBeRawPtr<WorkerGlobalScope> CompositorWorkerThread::createWorkerGlobalScope(PassOwnPtr<WorkerScriptStartupData> startupData)
|
| {
|
| return CompositorWorkerGlobalScope::create(this, startupData, m_timeOrigin);
|
| }
|
|
|