| Index: Source/core/workers/WorkerMessagingProxy.h
|
| diff --git a/Source/core/workers/WorkerMessagingProxy.h b/Source/core/workers/WorkerMessagingProxy.h
|
| index 8299e04804f0492682508ac067a977b9d6ea823a..bace41ad093c60865366dcc47d3e175ddce6663b 100644
|
| --- a/Source/core/workers/WorkerMessagingProxy.h
|
| +++ b/Source/core/workers/WorkerMessagingProxy.h
|
| @@ -46,8 +46,11 @@ class Worker;
|
| class WorkerClients;
|
| class WorkerInspectorProxy;
|
|
|
| -class WorkerMessagingProxy final : public WorkerGlobalScopeProxy, public WorkerLoaderProxy {
|
| - WTF_MAKE_NONCOPYABLE(WorkerMessagingProxy); WTF_MAKE_FAST_ALLOCATED;
|
| +class WorkerMessagingProxy final
|
| + : public WorkerGlobalScopeProxy
|
| + , private WorkerLoaderProxyProvider {
|
| + WTF_MAKE_NONCOPYABLE(WorkerMessagingProxy);
|
| + WTF_MAKE_FAST_ALLOCATED;
|
| public:
|
| WorkerMessagingProxy(Worker*, PassOwnPtrWillBeRawPtr<WorkerClients>);
|
|
|
| @@ -72,12 +75,6 @@ public:
|
| void workerGlobalScopeClosed();
|
| void workerThreadTerminated();
|
|
|
| - // Implementation of WorkerLoaderProxy.
|
| - // These methods are called on different threads to schedule loading
|
| - // requests and to send callbacks back to WorkerGlobalScope.
|
| - virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) override;
|
| - virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) override;
|
| -
|
| void workerThreadCreated(PassRefPtr<DedicatedWorkerThread>);
|
|
|
| protected:
|
| @@ -87,6 +84,12 @@ private:
|
| static void workerObjectDestroyedInternal(ExecutionContext*, WorkerMessagingProxy*);
|
| void terminateInternally();
|
|
|
| + // WorkerLoaderProxyProvider
|
| + // These methods are called on different threads to schedule loading
|
| + // requests and to send callbacks back to WorkerGlobalScope.
|
| + virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) override;
|
| + virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) override;
|
| +
|
| RefPtrWillBePersistent<ExecutionContext> m_executionContext;
|
| OwnPtr<WorkerObjectProxy> m_workerObjectProxy;
|
| Worker* m_workerObject;
|
| @@ -102,6 +105,8 @@ private:
|
| OwnPtr<WorkerInspectorProxy> m_workerInspectorProxy;
|
|
|
| OwnPtrWillBePersistent<WorkerClients> m_workerClients;
|
| +
|
| + RefPtr<WorkerLoaderProxy> m_loaderProxy;
|
| };
|
|
|
| } // namespace blink
|
|
|