| Index: Source/core/workers/WorkerMessagingProxy.h
|
| diff --git a/Source/core/workers/WorkerMessagingProxy.h b/Source/core/workers/WorkerMessagingProxy.h
|
| index 37a71ff06729d12e5adef48385c14f6cb2d48a2c..b4acc43d8236e78f85534541ef1030dc82a8e8ee 100644
|
| --- a/Source/core/workers/WorkerMessagingProxy.h
|
| +++ b/Source/core/workers/WorkerMessagingProxy.h
|
| @@ -41,7 +41,7 @@
|
| namespace blink {
|
|
|
| class WorkerObjectProxy;
|
| -class WorkerThread;
|
| +class WorkerScript;
|
| class ExecutionContext;
|
| class InProcessWorkerBase;
|
| class WorkerClients;
|
| @@ -71,15 +71,15 @@ public:
|
| void confirmMessageFromWorkerObject(bool hasPendingActivity);
|
| void reportPendingActivity(bool hasPendingActivity);
|
| void workerGlobalScopeClosed();
|
| - void workerThreadTerminated();
|
| + void workerScriptTerminated();
|
|
|
| - void workerThreadCreated(PassRefPtr<WorkerThread>);
|
| + void workerScriptCreated(PassRefPtr<WorkerScript>);
|
|
|
| protected:
|
| WorkerMessagingProxy(InProcessWorkerBase*, PassOwnPtrWillBeRawPtr<WorkerClients>);
|
| virtual ~WorkerMessagingProxy();
|
|
|
| - virtual PassRefPtr<WorkerThread> createWorkerThread(double originTime, PassOwnPtr<WorkerThreadStartupData>) = 0;
|
| + virtual PassRefPtr<WorkerScript> createWorkerScript(double originTime, PassOwnPtr<WorkerScriptStartupData>) = 0;
|
|
|
| PassRefPtr<WorkerLoaderProxy> loaderProxy() { return m_loaderProxy; }
|
| WorkerObjectProxy& workerObjectProxy() { return *m_workerObjectProxy.get(); }
|
| @@ -98,10 +98,10 @@ private:
|
| OwnPtr<WorkerObjectProxy> m_workerObjectProxy;
|
| 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;
|
|
|
|
|