Rename WorkerThread to WorkerScript

third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

Index: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
index a933efb7ed5e498c903ac7b50f3f1aa6ac22c9d2..069b4e86b041f85dc72f8d277fb3d41ee86906f2 100644
--- a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
+++ b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp
@@ -43,9 +43,9 @@
 #include "core/workers/WorkerInspectorProxy.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerScriptLoader.h"
-#include "core/workers/WorkerThreadStartupData.h"
+#include "core/workers/WorkerScriptStartupData.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
-#include "modules/serviceworkers/ServiceWorkerThread.h"
+#include "modules/serviceworkers/ServiceWorkerScript.h"
 #include "platform/Histogram.h"
 #include "platform/SharedBuffer.h"
 #include "platform/heap/Handle.h"
@@ -99,8 +99,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);
@@ -149,7 +149,7 @@ void WebEmbeddedWorkerImpl::terminateWorkerContext()
         m_workerContextClient->workerContextFailedToStart();
         return;
     }
-    if (!m_workerThread) {
+    if (!m_workerScript) {
         // The worker thread has not been created yet if the worker is asked to
         // terminate during waiting for debugger or paused after download.
         ASSERT(m_workerStartData.waitForDebuggerMode == WebEmbeddedWorkerStartData::WaitForDebugger || m_pauseAfterDownloadState == IsPausedAfterDownload);
@@ -157,8 +157,8 @@ void WebEmbeddedWorkerImpl::terminateWorkerContext()
         m_workerContextClient->workerContextFailedToStart();
         return;
     }
-    m_workerThread->terminate();
-    m_workerInspectorProxy->workerThreadTerminated();
+    m_workerScript->terminate();
+    m_workerInspectorProxy->workerScriptTerminated();
 }
 
 void WebEmbeddedWorkerImpl::resumeAfterDownload()
@@ -167,7 +167,7 @@ void WebEmbeddedWorkerImpl::resumeAfterDownload()
     ASSERT(m_pauseAfterDownloadState == IsPausedAfterDownload);
 
     m_pauseAfterDownloadState = DontPauseAfterDownload;
-    startWorkerThread();
+    startWorkerScript();
 }
 
 void WebEmbeddedWorkerImpl::attachDevTools(const WebString& hostId, int sessionId)
@@ -216,11 +216,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(BLINK_FROM_HERE, task);
-    return !m_workerThread->terminated();
+    m_workerScript->postTask(BLINK_FROM_HERE, task);
+    return !m_workerScript->terminated();
 }
 
 void WebEmbeddedWorkerImpl::prepareShadowPageForLoader()
@@ -335,17 +335,17 @@ void WebEmbeddedWorkerImpl::onScriptLoaderFinished()
         m_pauseAfterDownloadState = IsPausedAfterDownload;
         return;
     }
-    startWorkerThread();
+    startWorkerScript();
 }
 
-void WebEmbeddedWorkerImpl::startWorkerThread()
+void WebEmbeddedWorkerImpl::startWorkerScript()
 {
     ASSERT(m_pauseAfterDownloadState == DontPauseAfterDownload);
     ASSERT(!m_askedToTerminate);
 
     Document* document = m_mainFrame->frame()->document();
 
-    WorkerThreadStartMode startMode = DontPauseWorkerGlobalScopeOnStart;
+    WorkerScriptStartMode startMode = DontPauseWorkerGlobalScopeOnStart;
     if (InspectorInstrumentation::shouldPauseDedicatedWorkerOnStart(document))
         startMode = PauseWorkerGlobalScopeOnStart;
 
@@ -361,7 +361,7 @@ 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(),
@@ -376,9 +376,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);
-    m_workerThread->start(startupData.release());
-    m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), scriptURL);
+    m_workerScript = ServiceWorkerScript::create(m_loaderProxy, *m_workerGlobalScopeProxy);
+    m_workerScript->start(startupData.release());
+    m_workerInspectorProxy->workerScriptCreated(document, m_workerScript.get(), scriptURL);
 }
 
 } // namespace blink