| Index: third_party/WebKit/Source/web/WebSharedWorkerImpl.h
|
| diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.h b/third_party/WebKit/Source/web/WebSharedWorkerImpl.h
|
| index a67e66bb2a65d9c97191bd50632718c9fb42a5c0..45cc96e8d2d803c9c9573bea340254c66619906d 100644
|
| --- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.h
|
| +++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.h
|
| @@ -36,7 +36,7 @@
|
| #include "core/dom/ExecutionContext.h"
|
| #include "core/workers/WorkerLoaderProxy.h"
|
| #include "core/workers/WorkerReportingProxy.h"
|
| -#include "core/workers/WorkerThread.h"
|
| +#include "core/workers/WorkerScript.h"
|
| #include "public/web/WebContentSecurityPolicy.h"
|
| #include "public/web/WebDevToolsAgentClient.h"
|
| #include "public/web/WebFrameClient.h"
|
| @@ -82,7 +82,7 @@ public:
|
| void didEvaluateWorkerScript(bool success) override { }
|
| void workerGlobalScopeStarted(WorkerGlobalScope*) override;
|
| void workerGlobalScopeClosed() override;
|
| - void workerThreadTerminated() override;
|
| + void workerScriptTerminated() override;
|
| void willDestroyWorkerGlobalScope() override { }
|
|
|
| // WebFrameClient methods to support resource loading thru the 'shadow page'.
|
| @@ -110,11 +110,11 @@ public:
|
| private:
|
| ~WebSharedWorkerImpl() override;
|
|
|
| - void setWorkerThread(PassRefPtr<WorkerThread> thread) { m_workerThread = thread; }
|
| - WorkerThread* workerThread() { return m_workerThread.get(); }
|
| + void setWorkerScript(PassRefPtr<WorkerScript> script) { m_workerScript = script; }
|
| + WorkerScript* workerScript() { return m_workerScript.get(); }
|
|
|
| // Shuts down the worker thread.
|
| - void terminateWorkerThread();
|
| + void terminateWorkerScript();
|
|
|
| // Creates the shadow loader used for worker network requests.
|
| void initializeLoader();
|
| @@ -126,7 +126,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);
|
|
|
| @@ -145,7 +145,7 @@ private:
|
|
|
| OwnPtrWillBePersistent<WorkerInspectorProxy> m_workerInspectorProxy;
|
|
|
| - RefPtr<WorkerThread> m_workerThread;
|
| + RefPtr<WorkerScript> m_workerScript;
|
|
|
| WebSharedWorkerClient* m_client;
|
|
|
|
|