Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(469)

Unified Diff: Source/modules/serviceworkers/ServiceWorkerContainer.h

Issue 335293003: Add slots for navigator.serviceWorker.installing and active. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/serviceworkers/ServiceWorkerContainer.h
diff --git a/Source/modules/serviceworkers/ServiceWorkerContainer.h b/Source/modules/serviceworkers/ServiceWorkerContainer.h
index abd778466b33141ddf9d8db4fa0e33463d75fd9a..b3aa33e0161d54d91431a972cae5b28f6d211b1a 100644
--- a/Source/modules/serviceworkers/ServiceWorkerContainer.h
+++ b/Source/modules/serviceworkers/ServiceWorkerContainer.h
@@ -62,27 +62,30 @@ public:
void detachClient();
- PassRefPtrWillBeRawPtr<ServiceWorker> waiting() { return m_waiting.get(); }
+ PassRefPtrWillBeRawPtr<ServiceWorker> active() { return m_active.get(); }
PassRefPtrWillBeRawPtr<ServiceWorker> controller() { return m_controller.get(); }
+ PassRefPtrWillBeRawPtr<ServiceWorker> installing() { return m_installing.get(); }
+ PassRefPtrWillBeRawPtr<ServiceWorker> waiting() { return m_waiting.get(); }
ScriptPromise ready(ScriptState*);
ScriptPromise registerServiceWorker(ScriptState*, const String& pattern, const Dictionary&);
ScriptPromise unregisterServiceWorker(ScriptState*, const String& scope = String());
// WebServiceWorkerProviderClient overrides.
- virtual void setWaiting(blink::WebServiceWorker*) OVERRIDE;
+ virtual void setActive(blink::WebServiceWorker*) OVERRIDE;
virtual void setController(blink::WebServiceWorker*) OVERRIDE;
+ virtual void setInstalling(blink::WebServiceWorker*) OVERRIDE;
+ virtual void setWaiting(blink::WebServiceWorker*) OVERRIDE;
virtual void dispatchMessageEvent(const blink::WebString& message, const blink::WebMessagePortChannelArray&) OVERRIDE;
- // FIXME: Delete this when the embedder switches to setController.
- virtual void setCurrentServiceWorker(blink::WebServiceWorker*) OVERRIDE;
-
private:
explicit ServiceWorkerContainer(ExecutionContext*);
blink::WebServiceWorkerProvider* m_provider;
- RefPtr<ServiceWorker> m_waiting;
+ RefPtr<ServiceWorker> m_active;
RefPtr<ServiceWorker> m_controller;
+ RefPtr<ServiceWorker> m_installing;
+ RefPtr<ServiceWorker> m_waiting;
};
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698