| Index: Source/modules/serviceworkers/ServiceWorker.h
|
| diff --git a/Source/modules/serviceworkers/ServiceWorker.h b/Source/modules/serviceworkers/ServiceWorker.h
|
| index 7cbfd1a6cb449f87b782de01f95b80a43c609cd5..563feba400bb1a049546d718fca90550229114fe 100644
|
| --- a/Source/modules/serviceworkers/ServiceWorker.h
|
| +++ b/Source/modules/serviceworkers/ServiceWorker.h
|
| @@ -48,12 +48,12 @@ class ScriptPromiseResolver;
|
|
|
| class ServiceWorker
|
| : public AbstractWorker
|
| - , public blink::WebServiceWorkerProxy {
|
| + , public WebServiceWorkerProxy {
|
| public:
|
| virtual ~ServiceWorker() { }
|
|
|
| // For CallbackPromiseAdapter
|
| - typedef blink::WebServiceWorker WebType;
|
| + typedef WebServiceWorker WebType;
|
| static PassRefPtrWillBeRawPtr<ServiceWorker> take(ScriptPromiseResolver*, WebType* worker);
|
|
|
| static PassRefPtrWillBeRawPtr<ServiceWorker> from(ExecutionContext*, WebType*);
|
| @@ -83,7 +83,7 @@ private:
|
| };
|
|
|
| static PassRefPtrWillBeRawPtr<ServiceWorker> getOrCreate(ExecutionContext*, WebType*);
|
| - ServiceWorker(ExecutionContext*, PassOwnPtr<blink::WebServiceWorker>);
|
| + ServiceWorker(ExecutionContext*, PassOwnPtr<WebServiceWorker>);
|
| void setProxyState(ProxyState);
|
| void onPromiseResolved();
|
| void waitOnPromise(ScriptPromise);
|
| @@ -92,7 +92,7 @@ private:
|
| virtual bool hasPendingActivity() const OVERRIDE;
|
| virtual void stop() OVERRIDE;
|
|
|
| - OwnPtr<blink::WebServiceWorker> m_outerWorker;
|
| + OwnPtr<WebServiceWorker> m_outerWorker;
|
| ProxyState m_proxyState;
|
| };
|
|
|
|
|