content/child/service_worker/service_worker_dispatcher.cc - Issue 885443006: ServiceWorker: Get registration info and its version attributes in one lock operation

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 885443006: ServiceWorker: Get registration info and its version attributes in one lock operation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 months 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 | « no previous file | content/child/service_worker/service_worker_provider_context.h » ('j') | content/child/service_worker/web_service_worker_provider_impl.cc » ('J')
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 f33b86a0c8b0988c1aa209eaa24b37aafec8eec0..db5484612cc5b6d26805e97d9996563aee8de66d 100644

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

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

@@ -585,14 +585,14 @@ void ServiceWorkerDispatcher::SetReadyRegistration(

if (client == provider_clients_.end())

return;

- ServiceWorkerRegistrationObjectInfo info =

- provider->second->registration()->info();

+ ServiceWorkerRegistrationObjectInfo info;

+ ServiceWorkerVersionAttributes attrs;

+ provider->second->GetRegistrationInfoAndVersionAttributes(&info, &attrs);

WebServiceWorkerRegistrationImpl* registration =

FindServiceWorkerRegistration(info, false);

if (!registration) {

registration = CreateServiceWorkerRegistration(info, false);

- ServiceWorkerVersionAttributes attrs =

- provider->second->GetVersionAttributes();

registration->SetInstalling(GetServiceWorker(attrs.installing, false));

registration->SetWaiting(GetServiceWorker(attrs.waiting, false));

registration->SetActive(GetServiceWorker(attrs.active, false));