Rename WorkerThread to WorkerScript

third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp

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 aa495efd7e60256c7eac965fc58fd83a8012af16..3389f65a04ad429a9955ea3e0a209847916be933 100644
--- a/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp
+++ b/third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp
@@ -6,23 +6,23 @@
 
 #include "bindings/core/v8/SerializedScriptValue.h"
 #include "core/workers/WorkerObjectProxy.h"
-#include "core/workers/WorkerThreadStartupData.h"
+#include "core/workers/WorkerScriptStartupData.h"
 #include "modules/EventTargetModules.h"
-#include "modules/compositorworker/CompositorWorkerThread.h"
+#include "modules/compositorworker/CompositorWorkerScript.h"
 
 namespace blink {
 
-PassRefPtrWillBeRawPtr<CompositorWorkerGlobalScope> CompositorWorkerGlobalScope::create(CompositorWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startupData, double timeOrigin)
+PassRefPtrWillBeRawPtr<CompositorWorkerGlobalScope> CompositorWorkerGlobalScope::create(CompositorWorkerScript* script, PassOwnPtr<WorkerScriptStartupData> startupData, double timeOrigin)
 {
     // Note: startupData is finalized on return. After the relevant parts has been
     // passed along to the created 'context'.
-    RefPtrWillBeRawPtr<CompositorWorkerGlobalScope> context = adoptRefWillBeNoop(new CompositorWorkerGlobalScope(startupData->m_scriptURL, startupData->m_userAgent, thread, timeOrigin, startupData->m_starterOriginPrivilegeData.release(), startupData->m_workerClients.release()));
+    RefPtrWillBeRawPtr<CompositorWorkerGlobalScope> context = adoptRefWillBeNoop(new CompositorWorkerGlobalScope(startupData->m_scriptURL, startupData->m_userAgent, script, timeOrigin, startupData->m_starterOriginPrivilegeData.release(), startupData->m_workerClients.release()));
     context->applyContentSecurityPolicyFromVector(*startupData->m_contentSecurityPolicyHeaders);
     return context.release();
 }
 
-CompositorWorkerGlobalScope::CompositorWorkerGlobalScope(const KURL& url, const String& userAgent, CompositorWorkerThread* thread, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)
-    : WorkerGlobalScope(url, userAgent, thread, timeOrigin, starterOriginPrivilegeData, workerClients)
+CompositorWorkerGlobalScope::CompositorWorkerGlobalScope(const KURL& url, const String& userAgent, CompositorWorkerScript* script, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilegeData, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)
+    : WorkerGlobalScope(url, userAgent, script, timeOrigin, starterOriginPrivilegeData, workerClients)
     , m_callbackCollection(this)
 {
 }
@@ -48,7 +48,7 @@ void CompositorWorkerGlobalScope::postMessage(ExecutionContext* executionContext
     OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(executionContext, ports, exceptionState);
     if (exceptionState.hadException())
         return;
-    thread()->workerObjectProxy().postMessageToWorkerObject(message, channels.release());
+    workerScript()->workerObjectProxy().postMessageToWorkerObject(message, channels.release());
 }
 
 int CompositorWorkerGlobalScope::requestAnimationFrame(FrameRequestCallback* callback)
@@ -66,9 +66,9 @@ void CompositorWorkerGlobalScope::executeAnimationFrameCallbacks(double highResT
     m_callbackCollection.executeCallbacks(highResTimeNow, highResTimeNow);
 }
 
-CompositorWorkerThread* CompositorWorkerGlobalScope::thread() const
+CompositorWorkerScript* CompositorWorkerGlobalScope::workerScript() const
 {
-    return static_cast<CompositorWorkerThread*>(WorkerGlobalScope::thread());
+    return static_cast<CompositorWorkerScript*>(WorkerGlobalScope::workerScript());
 }
 
 } // namespace blink