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

Unified Diff: content/browser/service_worker/service_worker_provider_host.cc

Issue 717353004: ServiceWorker: Add support for .skipWaiting and controllerchange event(2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: do not replace other registerations Created 6 years, 1 month 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: content/browser/service_worker/service_worker_provider_host.cc
diff --git a/content/browser/service_worker/service_worker_provider_host.cc b/content/browser/service_worker/service_worker_provider_host.cc
index e16454558e0ec9cc46862b3110a811dcf3bfca6f..f18e2dd38ad5dd01162de1f6771d744e6a87cfd1 100644
--- a/content/browser/service_worker/service_worker_provider_host.cc
+++ b/content/browser/service_worker/service_worker_provider_host.cc
@@ -55,6 +55,17 @@ void ServiceWorkerProviderHost::OnRegistrationFailed(
DisassociateRegistration();
}
+void ServiceWorkerProviderHost::OnSkippedWaiting(
+ ServiceWorkerRegistration* registration) {
+ CHECK_EQ(associated_registration_.get(), registration);
falken 2014/11/19 04:19:56 seems DCHECK_EQ is OK here
xiang 2014/11/24 07:04:00 Done.
+ scoped_refptr<ServiceWorkerVersion> waiting_version =
+ registration->waiting_version();
+ CHECK_EQ(waiting_version->status(), ServiceWorkerVersion::INSTALLED);
+ waiting_version->RegisterStatusChangeCallback(
+ base::Bind(&ServiceWorkerProviderHost::SetControllerVersionAttribute,
+ AsWeakPtr(), waiting_version));
falken 2014/11/19 04:19:56 It's subtle that OnSkippedWaiting is called just b
xiang 2014/11/24 07:04:00 Yes, you are right, we can move it after ACTIVATIN
+}
+
void ServiceWorkerProviderHost::SetDocumentUrl(const GURL& url) {
DCHECK(!url.has_ref());
document_url_ = url;

Powered by Google App Engine
This is Rietveld 408576698