| Index: third_party/WebKit/Source/modules/compositorworker/CompositorWorkerScript.cpp
|
| diff --git a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerScript.cpp
|
| similarity index 78%
|
| rename from third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp
|
| rename to third_party/WebKit/Source/modules/compositorworker/CompositorWorkerScript.cpp
|
| index a1b4eef81f3208f80a5b6017a9053429843463bc..80fa8aa1024060481accfbbe4874f266aeb26704 100644
|
| --- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerThread.cpp
|
| +++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerScript.cpp
|
| @@ -2,12 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "modules/compositorworker/CompositorWorkerThread.h"
|
| +#include "modules/compositorworker/CompositorWorkerScript.h"
|
|
|
| #include "bindings/core/v8/V8GCController.h"
|
| #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 "platform/ThreadSafeFunctional.h"
|
| #include "platform/TraceEvent.h"
|
| @@ -33,7 +33,7 @@ public:
|
| return compositorWorkerSharedState;
|
| }
|
|
|
| - WebThreadSupportingGC* compositorWorkerThread()
|
| + WebThreadSupportingGC* compositorWorkerScript()
|
| {
|
| MutexLocker lock(m_mutex);
|
| if (!m_thread && isMainThread()) {
|
| @@ -137,81 +137,81 @@ private:
|
|
|
| } // namespace
|
|
|
| -PassRefPtr<CompositorWorkerThread> CompositorWorkerThread::create(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin)
|
| +PassRefPtr<CompositorWorkerScript> CompositorWorkerScript::create(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin)
|
| {
|
| - TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerThread::create");
|
| + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerScript::create");
|
| ASSERT(isMainThread());
|
| - return adoptRef(new CompositorWorkerThread(workerLoaderProxy, workerObjectProxy, timeOrigin));
|
| + return adoptRef(new CompositorWorkerScript(workerLoaderProxy, workerObjectProxy, timeOrigin));
|
| }
|
|
|
| -CompositorWorkerThread::CompositorWorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin)
|
| - : WorkerThread(workerLoaderProxy, workerObjectProxy)
|
| +CompositorWorkerScript::CompositorWorkerScript(PassRefPtr<WorkerLoaderProxy> workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin)
|
| + : WorkerScript(workerLoaderProxy, workerObjectProxy)
|
| , m_workerObjectProxy(workerObjectProxy)
|
| , m_timeOrigin(timeOrigin)
|
| {
|
| }
|
|
|
| -CompositorWorkerThread::~CompositorWorkerThread()
|
| +CompositorWorkerScript::~CompositorWorkerScript()
|
| {
|
| }
|
|
|
| -WebThreadSupportingGC* CompositorWorkerThread::sharedBackingThread()
|
| +WebThreadSupportingGC* CompositorWorkerScript::sharedBackingThread()
|
| {
|
| - return CompositorWorkerSharedState::instance().compositorWorkerThread();
|
| + return CompositorWorkerSharedState::instance().compositorWorkerScript();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<WorkerGlobalScope> CompositorWorkerThread::createWorkerGlobalScope(PassOwnPtr<WorkerThreadStartupData> startupData)
|
| +PassRefPtrWillBeRawPtr<WorkerGlobalScope> CompositorWorkerScript::createWorkerGlobalScope(PassOwnPtr<WorkerScriptStartupData> startupData)
|
| {
|
| - TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerThread::createWorkerGlobalScope");
|
| + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerScript::createWorkerGlobalScope");
|
| return CompositorWorkerGlobalScope::create(this, startupData, m_timeOrigin);
|
| }
|
|
|
| -WebThreadSupportingGC& CompositorWorkerThread::backingThread()
|
| +WebThreadSupportingGC& CompositorWorkerScript::backingThread()
|
| {
|
| - return *CompositorWorkerSharedState::instance().compositorWorkerThread();
|
| + return *CompositorWorkerSharedState::instance().compositorWorkerScript();
|
| }
|
|
|
| -void CompositorWorkerThread::initializeBackingThread()
|
| +void CompositorWorkerScript::initializeBackingThread()
|
| {
|
| - TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerThread::initializeBackingThread");
|
| + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerScript::initializeBackingThread");
|
| CompositorWorkerSharedState::instance().initializeBackingThread();
|
| }
|
|
|
| -void CompositorWorkerThread::shutdownBackingThread()
|
| +void CompositorWorkerScript::shutdownBackingThread()
|
| {
|
| - TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerThread::shutdownBackingThread");
|
| + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerScript::shutdownBackingThread");
|
| CompositorWorkerSharedState::instance().shutdownBackingThread();
|
| }
|
|
|
| -v8::Isolate* CompositorWorkerThread::initializeIsolate()
|
| +v8::Isolate* CompositorWorkerScript::initializeIsolate()
|
| {
|
| return CompositorWorkerSharedState::instance().initializeIsolate();
|
| }
|
|
|
| -void CompositorWorkerThread::willDestroyIsolate()
|
| +void CompositorWorkerScript::willDestroyIsolate()
|
| {
|
| - TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerThread::willDestroyIsolate");
|
| + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerScript::willDestroyIsolate");
|
| CompositorWorkerSharedState::instance().willDestroyIsolate();
|
| }
|
|
|
| -void CompositorWorkerThread::destroyIsolate()
|
| +void CompositorWorkerScript::destroyIsolate()
|
| {
|
| - TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerThread::destroyIsolate");
|
| + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerScript::destroyIsolate");
|
| CompositorWorkerSharedState::instance().destroyIsolate();
|
| }
|
|
|
| -void CompositorWorkerThread::terminateV8Execution()
|
| +void CompositorWorkerScript::terminateV8Execution()
|
| {
|
| - TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerThread::terminateV8Execution");
|
| + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), "CompositorWorkerScript::terminateV8Execution");
|
| CompositorWorkerSharedState::instance().terminateV8Execution();
|
| }
|
|
|
| -bool CompositorWorkerThread::hasThreadForTest()
|
| +bool CompositorWorkerScript::hasThreadForTest()
|
| {
|
| return CompositorWorkerSharedState::instance().hasThreadForTest();
|
| }
|
|
|
| -bool CompositorWorkerThread::hasIsolateForTest()
|
| +bool CompositorWorkerScript::hasIsolateForTest()
|
| {
|
| return CompositorWorkerSharedState::instance().hasIsolateForTest();
|
| }
|
|
|