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

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

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.cpp
diff --git a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
index 4f267bb9f662050552d3e7724c5fdfe9d89295a0..5efb36823fd3c2bc2a61d940fc249cd180e27f00 100644
--- a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
+++ b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
@@ -156,11 +156,6 @@ ScriptPromise ServiceWorkerContainer::ready(ScriptState* scriptState)
return ScriptPromise();
}
-void ServiceWorkerContainer::setCurrentServiceWorker(blink::WebServiceWorker* serviceWorker)
-{
- setController(serviceWorker);
-}
-
// If the WebServiceWorker is up for adoption (does not have a
// WebServiceWorkerProxy owner), rejects the adoption by deleting the
// WebServiceWorker.
@@ -170,13 +165,13 @@ static void deleteIfNoExistingOwner(blink::WebServiceWorker* serviceWorker)
delete serviceWorker;
}
-void ServiceWorkerContainer::setWaiting(blink::WebServiceWorker* serviceWorker)
+void ServiceWorkerContainer::setActive(blink::WebServiceWorker* serviceWorker)
{
if (!executionContext()) {
deleteIfNoExistingOwner(serviceWorker);
return;
}
- m_waiting = ServiceWorker::from(executionContext(), serviceWorker);
+ m_active = ServiceWorker::from(executionContext(), serviceWorker);
}
void ServiceWorkerContainer::setController(blink::WebServiceWorker* serviceWorker)
@@ -188,6 +183,24 @@ void ServiceWorkerContainer::setController(blink::WebServiceWorker* serviceWorke
m_controller = ServiceWorker::from(executionContext(), serviceWorker);
}
+void ServiceWorkerContainer::setInstalling(blink::WebServiceWorker* serviceWorker)
+{
+ if (!executionContext()) {
+ deleteIfNoExistingOwner(serviceWorker);
+ return;
+ }
+ m_installing = ServiceWorker::from(executionContext(), serviceWorker);
+}
+
+void ServiceWorkerContainer::setWaiting(blink::WebServiceWorker* serviceWorker)
+{
+ if (!executionContext()) {
+ deleteIfNoExistingOwner(serviceWorker);
+ return;
+ }
+ m_waiting = ServiceWorker::from(executionContext(), serviceWorker);
+}
+
void ServiceWorkerContainer::dispatchMessageEvent(const blink::WebString& message, const blink::WebMessagePortChannelArray& webChannels)
{
if (!executionContext() || !executionContext()->executingWindow())
« no previous file with comments | « Source/modules/serviceworkers/ServiceWorkerContainer.h ('k') | Source/modules/serviceworkers/ServiceWorkerContainer.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698