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

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

Issue 798833002: ServiceWorker: Make skipWaiting only works on documents using current registration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 2bb6499487916db409c6eecbd9c10cae0863b7e2..97d37cedb21b5b31b49f8456ac4c5202831bae57 100644
--- a/content/browser/service_worker/service_worker_provider_host.cc
+++ b/content/browser/service_worker/service_worker_provider_host.cc
@@ -84,6 +84,8 @@ void ServiceWorkerProviderHost::OnRegistrationFailed(
void ServiceWorkerProviderHost::OnSkippedWaiting(
ServiceWorkerRegistration* registration) {
DCHECK_EQ(associated_registration_.get(), registration);
+ if (!controlling_version_)
falken 2014/12/15 02:29:25 I think some explanation here using comments or fu
xiang 2014/12/15 06:00:52 I added these comments. I think a IsUsingRegistrat
falken 2014/12/15 06:18:01 My imagination was something like { return associa
falken 2014/12/15 06:20:20 Ah I totally missed the point of your comment. OK,
+ return;
ServiceWorkerVersion* active_version = registration->active_version();
DCHECK_EQ(active_version->status(), ServiceWorkerVersion::ACTIVATING);
SetControllerVersionAttribute(active_version);

Powered by Google App Engine
This is Rietveld 408576698