workers: Rename WorkerThread to WorkerScript.

Source/web/WebEmbeddedWorkerImpl.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/WorkerDebuggerAgent.h"
 #include "core/inspector/WorkerInspectorController.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerInspectorProxy.h"
 #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"
 #include "platform/heap/Handle.h"
 #include "platform/network/ContentSecurityPolicyParsers.h"
 #include "platform/network/ContentSecurityPolicyResponseHeaders.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebServiceWorkerProvider.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/web/WebDevToolsAgent.h"
@@ skipping 89 matching lines @@
     , m_waitingForDebuggerState(NotWaitingForDebugger)
 {
     runningWorkerInstances().add(this);
 }
 
 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);
     ASSERT(m_webView);
 
     // Detach the client before closing the view to avoid getting called back.
     m_mainFrame->setClient(0);
 
     m_webView->close();
     m_mainFrame->close();
@@ skipping 31 matching lines @@
         m_mainScriptLoader.clear();
         // This may delete 'this'.
         m_workerContextClient->workerContextFailedToStart();
         return;
     }
     if (m_pauseAfterDownloadState == IsPausedAfterDownload) {
         // This may delete 'this'.
         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()
 {
     ASSERT(!m_askedToTerminate);
     bool wasPaused = (m_pauseAfterDownloadState == IsPausedAfterDownload);
     m_pauseAfterDownloadState = DontPauseAfterDownload;
 
     // If we were asked to wait for debugger while updating service worker version then it is good time now.
     m_workerContextClient->workerReadyForInspection();
     if (m_workerStartData.waitForDebuggerMode == WebEmbeddedWorkerStartData::WaitForDebugger)
         m_waitingForDebuggerState = WaitingForDebuggerAfterScriptLoaded;
     else if (wasPaused)
-        startWorkerThread();
+        startWorkerScript();
 }
 
 void WebEmbeddedWorkerImpl::attachDevTools(const WebString& hostId)
 {
     WebDevToolsAgent* devtoolsAgent = m_mainFrame->devToolsAgent();
     if (devtoolsAgent)
         devtoolsAgent->attach(hostId);
 }
 
 void WebEmbeddedWorkerImpl::reattachDevTools(const WebString& hostId, const WebString& savedState)
@@ skipping 28 matching lines @@
     pageInspector->dispatchMessageFromWorker(message);
 }
 
 void WebEmbeddedWorkerImpl::postTaskToLoader(PassOwnPtr<ExecutionContextTask> task)
 {
     m_mainFrame->frame()->document()->postTask(FROM_HERE, task);
 }
 
 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()
 {
     // Create 'shadow page', which is never displayed and is used mainly to
     // provide a context for loading on the main thread.
     //
     // FIXME: This does mostly same as WebSharedWorkerImpl::initializeLoader.
     // This code, and probably most of the code in this class should be shared
     // with SharedWorker.
@@ skipping 65 matching lines @@
     m_workerContextClient->sendDevToolsMessage(callId, message, state);
 }
 
 void WebEmbeddedWorkerImpl::resumeStartup()
 {
     WaitingForDebuggerState waitingForDebuggerState = m_waitingForDebuggerState;
     m_waitingForDebuggerState = NotWaitingForDebugger;
     if (waitingForDebuggerState == WaitingForDebuggerBeforeLoadingScript)
         loadShadowPage();
     else if (waitingForDebuggerState == WaitingForDebuggerAfterScriptLoaded)
-        startWorkerThread();
+        startWorkerScript();
 }
 
 void WebEmbeddedWorkerImpl::onScriptLoaderFinished()
 {
     ASSERT(m_mainScriptLoader);
 
     if (m_askedToTerminate)
         return;
 
     if (m_mainScriptLoader->failed()) {
         m_mainScriptLoader.clear();
         // This may delete 'this'.
         m_workerContextClient->workerContextFailedToStart();
         return;
     }
 
     Platform::current()->histogramCustomCounts("ServiceWorker.ScriptSize", m_mainScriptLoader->script().length(), 1000, 5000000, 50);
     if (m_mainScriptLoader->cachedMetadata())
         Platform::current()->histogramCustomCounts("ServiceWorker.ScriptCachedMetadataSize", m_mainScriptLoader->cachedMetadata()->size(), 1000, 50000000, 50);
 
     if (m_pauseAfterDownloadState == DoPauseAfterDownload) {
         m_pauseAfterDownloadState = IsPausedAfterDownload;
         m_workerContextClient->didPauseAfterDownload();
         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;
     if (InspectorInstrumentation::shouldPauseDedicatedWorkerOnStart(document))
         startMode = PauseWorkerGlobalScopeOnStart;
 
     // FIXME: this document's origin is pristine and without any extra privileges. (crbug.com/254993)
     SecurityOrigin* starterOrigin = document->securityOrigin();
 
     OwnPtrWillBeRawPtr<WorkerClients> workerClients = WorkerClients::create();
     provideContentSettingsClientToWorker(workerClients.get(), m_contentSettingsClient.release());
     provideServiceWorkerGlobalScopeClientToWorker(workerClients.get(), ServiceWorkerGlobalScopeClientImpl::create(*m_workerContextClient));
     provideServiceWorkerContainerClientToWorker(workerClients.get(), adoptPtr(m_workerContextClient->createServiceWorkerProvider()));
 
     // We need to set the CSP to both the shadow page's document and the ServiceWorkerGlobalScope.
     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(),
             m_mainScriptLoader->releaseCachedMetadata(),
             startMode,
             document->contentSecurityPolicy()->deprecatedHeader(),
             document->contentSecurityPolicy()->deprecatedHeaderType(),
             starterOrigin,
             workerClients.release(),
             static_cast<V8CacheOptions>(m_workerStartData.v8CacheOptions));
 
     m_mainScriptLoader.clear();
 
     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