content/browser/service_worker/service_worker_registration.h - 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_registration.h

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_register_job.cc ('k') | content/browser/service_worker/service_worker_registration.cc » ('j') | content/browser/service_worker/service_worker_registration.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_registration.h

diff --git a/content/browser/service_worker/service_worker_registration.h b/content/browser/service_worker/service_worker_registration.h

index b386eecfad3fa265444694eb99c850339b07ebc3..7326139106047f70e8273a3e97dbe48e1aca7aa4 100644

--- a/content/browser/service_worker/service_worker_registration.h

+++ b/content/browser/service_worker/service_worker_registration.h

@@ -102,6 +102,9 @@ class CONTENT_EXPORT ServiceWorkerRegistration

// is called, activation is initiated immediately.

void ActivateWaitingVersionWhenReady();

+ // Activate version immediately. Used when skip waiting flag is set.

falken 2014/11/14 04:00:15 The second sentence is a little misleading: it's a

xiang 2014/11/17 08:42:10 Done.

+ void ActivateWaitingVersion();

// Triggers the [[ClearRegistration]] algorithm when the currently

// active version has no controllees. Deletes this registration

// from storage immediately.

@@ -131,8 +134,7 @@ class CONTENT_EXPORT ServiceWorkerRegistration

// ServiceWorkerVersion::Listener override.

void OnNoControllees(ServiceWorkerVersion* version) override;

- // This method corresponds to the [[Activate]] algorithm.

- void ActivateWaitingVersion();

+ void PrepareProviderHostsToSkipWaiting();

void OnActivateEventFinished(

ServiceWorkerVersion* activating_version,

ServiceWorkerStatusCode status);