content/browser/service_worker/service_worker_register_job.cc - Issue 717353004: ServiceWorker: Add support for .skipWaiting and controllerchange event(2/3)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/service_worker/service_worker_register_job.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: add missing '!' 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

« no previous file with comments | « content/browser/service_worker/service_worker_provider_host.cc ('k') | content/browser/service_worker/service_worker_registration.h » ('j') | content/browser/service_worker/service_worker_registration.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_register_job.cc

diff --git a/content/browser/service_worker/service_worker_register_job.cc b/content/browser/service_worker/service_worker_register_job.cc

index b68cd30f8199d6812f9ace3a66c4f1534cb5e43d..2fa35337719dcb543e04539c5b47ee6e33c5bc46 100644

--- a/content/browser/service_worker/service_worker_register_job.cc

+++ b/content/browser/service_worker/service_worker_register_job.cc

@@ -426,11 +426,14 @@ void ServiceWorkerRegisterJob::OnStoreRegistrationComplete(

// and "installed" as the arguments."

new_version()->SetStatus(ServiceWorkerVersion::INSTALLED);

- // TODO(michaeln): "13. If activateImmediate is true, then..."

- // "14. Wait until no document is using registration as their

- // Service Worker registration."

- registration()->ActivateWaitingVersionWhenReady();

+ // "If registration's waiting worker's skip waiting flag is set:"

+ if (new_version()->skip_waiting()) {

+ registration()->ActivateWaitingVersion();

+ } else {

+ // "14. Wait until no document is using registration as their

+ // Service Worker registration."

+ registration()->ActivateWaitingVersionWhenReady();

+ }

Complete(SERVICE_WORKER_OK);

}