Index: Source/web/WebSharedWorkerImpl.h |
diff --git a/Source/web/WebSharedWorkerImpl.h b/Source/web/WebSharedWorkerImpl.h |
index e69bb9d945bedd6c152bbf8d7cda8ecb7c9135dd..b8358977005f19dcf3a5a4a5ac3ab5d637dee58c 100644 |
--- a/Source/web/WebSharedWorkerImpl.h |
+++ b/Source/web/WebSharedWorkerImpl.h |
@@ -36,8 +36,8 @@ |
#include "core/dom/ExecutionContext.h" |
#include "core/workers/WorkerLoaderProxy.h" |
#include "core/workers/WorkerReportingProxy.h" |
+#include "core/workers/WorkerScript.h" |
#include "core/workers/WorkerScriptLoaderClient.h" |
-#include "core/workers/WorkerThread.h" |
#include "public/web/WebContentSecurityPolicy.h" |
#include "public/web/WebDevToolsAgentClient.h" |
#include "public/web/WebFrameClient.h" |
@@ -80,7 +80,7 @@ public: |
virtual void didEvaluateWorkerScript(bool success) override { }; |
virtual void workerGlobalScopeStarted(WorkerGlobalScope*) override; |
virtual void workerGlobalScopeClosed() override; |
- virtual void workerThreadTerminated() override; |
+ virtual void workerScriptTerminated() override; |
virtual void willDestroyWorkerGlobalScope() override { } |
// WebFrameClient methods to support resource loading thru the 'shadow page'. |
@@ -113,8 +113,8 @@ private: |
WebSharedWorkerClient* client() { return m_client->get(); } |
- void setWorkerThread(PassRefPtr<WorkerThread> thread) { m_workerThread = thread; } |
- WorkerThread* workerThread() { return m_workerThread.get(); } |
+ void setWorkerThread(PassRefPtr<WorkerScript> thread) { m_workerScript = thread; } |
+ WorkerScript* workerScript() { return m_workerScript.get(); } |
// Shuts down the worker thread. |
void stopWorkerThread(); |
@@ -129,7 +129,7 @@ private: |
static void connectTask(PassOwnPtr<WebMessagePortChannel>, ExecutionContext*); |
// Tasks that are run on the main thread. |
void workerGlobalScopeClosedOnMainThread(); |
- void workerThreadTerminatedOnMainThread(); |
+ void workerScriptTerminatedOnMainThread(); |
void postMessageToPageInspectorOnMainThread(const String& message); |
@@ -148,7 +148,7 @@ private: |
OwnPtr<WorkerInspectorProxy> m_workerInspectorProxy; |
- RefPtr<WorkerThread> m_workerThread; |
+ RefPtr<WorkerScript> m_workerScript; |
// This one's initialized and bound to the main thread. |
RefPtr<WeakReference<WebSharedWorkerClient>> m_client; |