| Index: Source/web/ServiceWorkerGlobalScopeProxy.h
|
| diff --git a/Source/web/ServiceWorkerGlobalScopeProxy.h b/Source/web/ServiceWorkerGlobalScopeProxy.h
|
| index 1b8d16791a8f9f36a4fa276b0dd398d53173bf68..c8bda76631c4026892cb026d8f7d4c8390aacc1c 100644
|
| --- a/Source/web/ServiceWorkerGlobalScopeProxy.h
|
| +++ b/Source/web/ServiceWorkerGlobalScopeProxy.h
|
| @@ -60,10 +60,10 @@ class WebServiceWorkerRequest;
|
| // WorkerGlobalScope.
|
| class ServiceWorkerGlobalScopeProxy FINAL
|
| : public WebServiceWorkerContextProxy
|
| - , public blink::WorkerReportingProxy {
|
| + , public WorkerReportingProxy {
|
| WTF_MAKE_NONCOPYABLE(ServiceWorkerGlobalScopeProxy);
|
| public:
|
| - static PassOwnPtr<ServiceWorkerGlobalScopeProxy> create(WebEmbeddedWorkerImpl&, blink::ExecutionContext&, WebServiceWorkerContextClient&);
|
| + static PassOwnPtr<ServiceWorkerGlobalScopeProxy> create(WebEmbeddedWorkerImpl&, ExecutionContext&, WebServiceWorkerContextClient&);
|
| virtual ~ServiceWorkerGlobalScopeProxy();
|
|
|
| // WebServiceWorkerContextProxy overrides:
|
| @@ -79,20 +79,20 @@ public:
|
| virtual void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE;
|
| virtual void postMessageToPageInspector(const String&) OVERRIDE;
|
| virtual void updateInspectorStateCookie(const String&) OVERRIDE;
|
| - virtual void workerGlobalScopeStarted(blink::WorkerGlobalScope*) OVERRIDE;
|
| + virtual void workerGlobalScopeStarted(WorkerGlobalScope*) OVERRIDE;
|
| virtual void workerGlobalScopeClosed() OVERRIDE;
|
| virtual void willDestroyWorkerGlobalScope() OVERRIDE;
|
| virtual void workerThreadTerminated() OVERRIDE;
|
|
|
| private:
|
| - ServiceWorkerGlobalScopeProxy(WebEmbeddedWorkerImpl&, blink::ExecutionContext&, WebServiceWorkerContextClient&);
|
| + ServiceWorkerGlobalScopeProxy(WebEmbeddedWorkerImpl&, ExecutionContext&, WebServiceWorkerContextClient&);
|
|
|
| WebEmbeddedWorkerImpl& m_embeddedWorker;
|
| - blink::ExecutionContext& m_executionContext;
|
| + ExecutionContext& m_executionContext;
|
|
|
| WebServiceWorkerContextClient& m_client;
|
|
|
| - blink::WorkerGlobalScope* m_workerGlobalScope;
|
| + WorkerGlobalScope* m_workerGlobalScope;
|
| };
|
|
|
| } // namespace blink
|
|
|