Rename WorkerThread to WorkerScript

third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp

Index: third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp
diff --git a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp
index e2b281dbf7a079e141eea1b640d30d1900048f5d..2d661c0903564aaa0e54faea5d4deb9cb425f3f4 100644
--- a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.cpp
@@ -52,7 +52,6 @@
 #include "core/inspector/ConsoleMessageStorage.h"
 #include "core/inspector/InspectorConsoleInstrumentation.h"
 #include "core/inspector/WorkerInspectorController.h"
-#include "core/loader/WorkerThreadableLoader.h"
 #include "core/workers/WorkerNavigator.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerConsole.h"
@@ -60,8 +59,8 @@
 #include "core/workers/WorkerLocation.h"
 #include "core/workers/WorkerNavigator.h"
 #include "core/workers/WorkerReportingProxy.h"
+#include "core/workers/WorkerScript.h"
 #include "core/workers/WorkerScriptLoader.h"
-#include "core/workers/WorkerThread.h"
 #include "platform/network/ContentSecurityPolicyParsers.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
@@ -71,12 +70,12 @@
 
 namespace blink {
 
-WorkerGlobalScope::WorkerGlobalScope(const KURL& url, const String& userAgent, WorkerThread* thread, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilageData, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)
+WorkerGlobalScope::WorkerGlobalScope(const KURL& url, const String& userAgent, WorkerScript* workerScript, double timeOrigin, PassOwnPtr<SecurityOrigin::PrivilegeData> starterOriginPrivilageData, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)
     : m_url(url)
     , m_userAgent(userAgent)
     , m_v8CacheOptions(V8CacheOptionsDefault)
-    , m_scriptController(WorkerOrWorkletScriptController::create(this, thread->isolate()))
-    , m_thread(thread)
+    , m_scriptController(WorkerOrWorkletScriptController::create(this, workerScript->isolate()))
+    , m_workerScript(workerScript)
     , m_workerInspectorController(adoptRefWillBeNoop(new WorkerInspectorController(this)))
     , m_closing(false)
     , m_eventQueue(WorkerEventQueue::create(this))
@@ -93,7 +92,7 @@ WorkerGlobalScope::WorkerGlobalScope(const KURL& url, const String& userAgent, W
     if (m_workerClients)
         m_workerClients->reattachThread();
 
-    m_thread->setWorkerInspectorController(m_workerInspectorController.get());
+    m_workerScript->setWorkerInspectorController(m_workerInspectorController.get());
 }
 
 WorkerGlobalScope::~WorkerGlobalScope()
@@ -182,7 +181,7 @@ WorkerNavigator* WorkerGlobalScope::navigator() const
 
 void WorkerGlobalScope::postTask(const WebTraceLocation& location, PassOwnPtr<ExecutionContextTask> task)
 {
-    thread()->postTask(location, task);
+    workerScript()->postTask(location, task);
 }
 
 void WorkerGlobalScope::clearScript()
@@ -195,14 +194,14 @@ void WorkerGlobalScope::clearScript()
 void WorkerGlobalScope::clearInspector()
 {
     ASSERT(m_workerInspectorController);
-    thread()->setWorkerInspectorController(nullptr);
+    workerScript()->setWorkerInspectorController(nullptr);
     m_workerInspectorController->dispose();
     m_workerInspectorController.clear();
 }
 
 void WorkerGlobalScope::dispose()
 {
-    ASSERT(thread()->isCurrentThread());
+    ASSERT(workerScript()->isCurrentThread());
     stopActiveDOMObjects();
 
     // Event listeners would keep DOMWrapperWorld objects alive for too long. Also, they have references to JS objects,
@@ -291,7 +290,7 @@ void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, int, c
     consoleMessage->setCallStack(callStack);
     m_pendingMessages.set(exceptionId, consoleMessage);
 
-    thread()->workerReportingProxy().reportException(errorMessage, lineNumber, columnNumber, sourceURL, exceptionId);
+    workerScript()->workerReportingProxy().reportException(errorMessage, lineNumber, columnNumber, sourceURL, exceptionId);
 }
 
 void WorkerGlobalScope::reportBlockedScriptExecutionToInspector(const String& directiveText)
@@ -303,7 +302,7 @@ void WorkerGlobalScope::addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>
 {
     ASSERT(isContextThread());
     RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = prpConsoleMessage;
-    thread()->workerReportingProxy().reportConsoleMessage(consoleMessage);
+    workerScript()->workerReportingProxy().reportConsoleMessage(consoleMessage);
     addMessageToWorkerConsole(consoleMessage.release());
 }
 
@@ -315,7 +314,7 @@ void WorkerGlobalScope::addMessageToWorkerConsole(PassRefPtrWillBeRawPtr<Console
 
 bool WorkerGlobalScope::isContextThread() const
 {
-    return thread()->isCurrentThread();
+    return workerScript()->isCurrentThread();
 }
 
 bool WorkerGlobalScope::isJSExecutionForbidden() const
@@ -380,7 +379,7 @@ bool WorkerGlobalScope::isSecureContext(String& errorMessage, const SecureContex
     // a simple check here. Once we have a need for a real
     // |isSecureContext| check here, we can check the responsible
     // document for a privileged context at worker creation time, pass
-    // it in via WorkerThreadStartupData, and check it here.
+    // it in via WorkerScriptStartupData, and check it here.
     if (securityOrigin()->isPotentiallyTrustworthy())
         return true;
     errorMessage = securityOrigin()->isPotentiallyTrustworthyErrorMessage();
@@ -389,7 +388,7 @@ bool WorkerGlobalScope::isSecureContext(String& errorMessage, const SecureContex
 
 void WorkerGlobalScope::removeURLFromMemoryCache(const KURL& url)
 {
-    m_thread->workerLoaderProxy()->postTaskToLoader(createCrossThreadTask(&WorkerGlobalScope::removeURLFromMemoryCacheInternal, url));
+    m_workerScript->workerLoaderProxy()->postTaskToLoader(createCrossThreadTask(&WorkerGlobalScope::removeURLFromMemoryCacheInternal, url));
 }
 
 void WorkerGlobalScope::removeURLFromMemoryCacheInternal(const KURL& url)