| Index: third_party/WebKit/Source/core/workers/WorkerMessagingProxy.h
|
| diff --git a/third_party/WebKit/Source/core/workers/WorkerMessagingProxy.h b/third_party/WebKit/Source/core/workers/WorkerMessagingProxy.h
|
| index 95d31d048ef2485a4493b5084d964c05c84e7763..0b427044b26ad5fa7fe7473ade580fb21aada53f 100644
|
| --- a/third_party/WebKit/Source/core/workers/WorkerMessagingProxy.h
|
| +++ b/third_party/WebKit/Source/core/workers/WorkerMessagingProxy.h
|
| @@ -41,7 +41,7 @@
|
| namespace blink {
|
|
|
| class WorkerObjectProxy;
|
| -class WorkerThread;
|
| +class WorkerScript;
|
| class ExecutionContext;
|
| class InProcessWorkerBase;
|
| class WorkerClients;
|
| @@ -54,7 +54,7 @@ class CORE_EXPORT WorkerMessagingProxy
|
| public:
|
| // Implementations of WorkerGlobalScopeProxy.
|
| // (Only use these methods in the worker object thread.)
|
| - void startWorkerGlobalScope(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode) override;
|
| + void startWorkerGlobalScope(const KURL& scriptURL, const String& userAgent, const String& sourceCode, WorkerScriptStartMode) override;
|
| void terminateWorkerGlobalScope() override;
|
| void postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue>, PassOwnPtr<MessagePortChannelArray>) override;
|
| bool hasPendingActivity() const override;
|
| @@ -71,9 +71,9 @@ public:
|
| void confirmMessageFromWorkerObject(bool hasPendingActivity);
|
| void reportPendingActivity(bool hasPendingActivity);
|
| void workerGlobalScopeClosed();
|
| - void workerThreadTerminated();
|
| + void workerScriptTerminated();
|
|
|
| - void workerThreadCreated(PassRefPtr<WorkerThread>);
|
| + void workerScriptCreated(PassRefPtr<WorkerScript>);
|
|
|
| ExecutionContext* executionContext() const { return m_executionContext.get(); }
|
|
|
| @@ -81,7 +81,7 @@ protected:
|
| WorkerMessagingProxy(InProcessWorkerBase*, PassOwnPtrWillBeRawPtr<WorkerClients>);
|
| ~WorkerMessagingProxy() override;
|
|
|
| - virtual PassRefPtr<WorkerThread> createWorkerThread(double originTime) = 0;
|
| + virtual PassRefPtr<WorkerScript> createWorkerScript(double originTime) = 0;
|
|
|
| PassRefPtr<WorkerLoaderProxy> loaderProxy() { return m_loaderProxy; }
|
| WorkerObjectProxy& workerObjectProxy() { return *m_workerObjectProxy.get(); }
|
| @@ -100,10 +100,10 @@ private:
|
| OwnPtr<WorkerObjectProxy> m_workerObjectProxy;
|
| WeakPersistent<InProcessWorkerBase> m_workerObject;
|
| bool m_mayBeDestroyed;
|
| - RefPtr<WorkerThread> m_workerThread;
|
| + RefPtr<WorkerScript> m_workerScript;
|
|
|
| unsigned m_unconfirmedMessageCount; // Unconfirmed messages from worker object to worker thread.
|
| - bool m_workerThreadHadPendingActivity; // The latest confirmation from worker thread reported that it was still active.
|
| + bool m_workerScriptHadPendingActivity; // The latest confirmation from worker thread reported that it was still active.
|
|
|
| bool m_askedToTerminate;
|
|
|
|
|