content/child/service_worker/service_worker_dispatcher.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/child/service_worker/service_worker_dispatcher.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: rebase again 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

« no previous file with comments | « content/child/service_worker/service_worker_dispatcher.h ('k') | content/child/service_worker/service_worker_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/service_worker/service_worker_dispatcher.cc

diff --git a/content/child/service_worker/service_worker_dispatcher.cc b/content/child/service_worker/service_worker_dispatcher.cc

index 668542b8cb8ee898ea2bb2f4a84f23e283751fdc..91ddd57dfda472292b362647156db1d1fe06e561 100644

--- a/content/child/service_worker/service_worker_dispatcher.cc

+++ b/content/child/service_worker/service_worker_dispatcher.cc

@@ -639,7 +639,8 @@ void ServiceWorkerDispatcher::SetReadyRegistration(

void ServiceWorkerDispatcher::OnSetControllerServiceWorker(

int thread_id,

int provider_id,

- const ServiceWorkerObjectInfo& info) {

+ const ServiceWorkerObjectInfo& info,

+ bool should_notify_controllerchange) {

TRACE_EVENT2("ServiceWorker",

"ServiceWorkerDispatcher::OnSetControllerServiceWorker",

"Thread ID", thread_id,

@@ -654,7 +655,8 @@ void ServiceWorkerDispatcher::OnSetControllerServiceWorker(

ScriptClientMap::iterator found = script_clients_.find(provider_id);

if (found != script_clients_.end()) {

// Populate the .controller field with the new worker object.

- found->second->setController(GetServiceWorker(info, false));

+ found->second->setController(GetServiceWorker(info, false),

+ should_notify_controllerchange);

}