workers: Rename WorkerThread to WorkerScript.

Source/web/WebEmbeddedWorkerImpl.cpp

Index: Source/web/WebEmbeddedWorkerImpl.cpp
diff --git a/Source/web/WebEmbeddedWorkerImpl.cpp b/Source/web/WebEmbeddedWorkerImpl.cpp
index b536944ec0bd8bcf8051eda7f60d29a9b861d23f..7cc34d87ff3c7e1192aa1504ca5e1fbf60adbb3c 100644
--- a/Source/web/WebEmbeddedWorkerImpl.cpp
+++ b/Source/web/WebEmbeddedWorkerImpl.cpp
@@ -45,7 +45,7 @@
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerScriptLoader.h"
 #include "core/workers/WorkerScriptLoaderClient.h"
-#include "core/workers/WorkerThreadStartupData.h"
+#include "core/workers/WorkerScriptStartupData.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "modules/serviceworkers/ServiceWorkerThread.h"
 #include "platform/SharedBuffer.h"
@@ -155,8 +155,8 @@ WebEmbeddedWorkerImpl::~WebEmbeddedWorkerImpl()
     // Prevent onScriptLoaderFinished from deleting 'this'.
     m_askedToTerminate = true;
 
-    if (m_workerThread)
-        m_workerThread->terminateAndWait();
+    if (m_workerScript)
+        m_workerScript->terminateAndWait();
 
     ASSERT(runningWorkerInstances().contains(this));
     runningWorkerInstances().remove(this);
@@ -208,9 +208,9 @@ void WebEmbeddedWorkerImpl::terminateWorkerContext()
         m_workerContextClient->workerContextFailedToStart();
         return;
     }
-    if (m_workerThread)
-        m_workerThread->stop();
-    m_workerInspectorProxy->workerThreadTerminated();
+    if (m_workerScript)
+        m_workerScript->stop();
+    m_workerInspectorProxy->workerScriptTerminated();
 }
 
 void WebEmbeddedWorkerImpl::resumeAfterDownload()
@@ -224,7 +224,7 @@ void WebEmbeddedWorkerImpl::resumeAfterDownload()
     if (m_workerStartData.waitForDebuggerMode == WebEmbeddedWorkerStartData::WaitForDebugger)
         m_waitingForDebuggerState = WaitingForDebuggerAfterScriptLoaded;
     else if (wasPaused)
-        startWorkerThread();
+        startWorkerScript();
 }
 
 void WebEmbeddedWorkerImpl::attachDevTools(const WebString& hostId)
@@ -273,11 +273,11 @@ void WebEmbeddedWorkerImpl::postTaskToLoader(PassOwnPtr<ExecutionContextTask> ta
 
 bool WebEmbeddedWorkerImpl::postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask> task)
 {
-    if (m_askedToTerminate || !m_workerThread)
+    if (m_askedToTerminate || !m_workerScript)
         return false;
 
-    m_workerThread->postTask(FROM_HERE, task);
-    return !m_workerThread->terminated();
+    m_workerScript->postTask(FROM_HERE, task);
+    return !m_workerScript->terminated();
 }
 
 void WebEmbeddedWorkerImpl::prepareShadowPageForLoader()
@@ -363,7 +363,7 @@ void WebEmbeddedWorkerImpl::resumeStartup()
     if (waitingForDebuggerState == WaitingForDebuggerBeforeLoadingScript)
         loadShadowPage();
     else if (waitingForDebuggerState == WaitingForDebuggerAfterScriptLoaded)
-        startWorkerThread();
+        startWorkerScript();
 }
 
 void WebEmbeddedWorkerImpl::onScriptLoaderFinished()
@@ -389,10 +389,10 @@ void WebEmbeddedWorkerImpl::onScriptLoaderFinished()
         m_workerContextClient->didPauseAfterDownload();
         return;
     }
-    startWorkerThread();
+    startWorkerScript();
 }
 
-void WebEmbeddedWorkerImpl::startWorkerThread()
+void WebEmbeddedWorkerImpl::startWorkerScript()
 {
     ASSERT(m_pauseAfterDownloadState == DontPauseAfterDownload);
     ASSERT(!m_askedToTerminate);
@@ -415,8 +415,8 @@ void WebEmbeddedWorkerImpl::startWorkerThread()
     document->initContentSecurityPolicy(m_mainScriptLoader->releaseContentSecurityPolicy());
 
     KURL scriptURL = m_mainScriptLoader->url();
-    OwnPtr<WorkerThreadStartupData> startupData =
-        WorkerThreadStartupData::create(
+    OwnPtr<WorkerScriptStartupData> startupData =
+        WorkerScriptStartupData::create(
             scriptURL,
             m_workerStartData.userAgent,
             m_mainScriptLoader->script(),
@@ -432,9 +432,9 @@ void WebEmbeddedWorkerImpl::startWorkerThread()
 
     m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *document, *m_workerContextClient);
     m_loaderProxy = WorkerLoaderProxy::create(this);
-    m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalScopeProxy, startupData.release());
-    m_workerThread->start();
-    m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), scriptURL);
+    m_workerScript = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalScopeProxy, startupData.release());
+    m_workerScript->start();
+    m_workerInspectorProxy->workerScriptCreated(document, m_workerScript.get(), scriptURL);
 }
 
 } // namespace blink