Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp - Issue 900793002: ServiceWorker: Support SWRegistration.unregister() in SWGlobalScope [2/2]

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: Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp

Issue 900793002: ServiceWorker: Support SWRegistration.unregister() in SWGlobalScope [2/2] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: WIP: add test Created 5 years, 10 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 | « LayoutTests/http/tests/serviceworker/ServiceWorkerGlobalScope/unregister.html ('k') | Source/web/WebEmbeddedWorkerImpl.cpp » ('j') | public/web/WebServiceWorkerContextClient.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp

diff --git a/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp b/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp

index 43869698db63831fde47c937d250eac9368afed3..9047eb9fca4e0eeab49c9e67d14ee970a559b98c 100644

--- a/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp

+++ b/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp

@@ -44,6 +44,12 @@ ServiceWorkerContainerClient* ServiceWorkerContainerClient::from(ExecutionContex

return static_cast<ServiceWorkerContainerClient*>(DocumentSupplement::from(document, supplementName()));

}

+ if (context->isServiceWorkerGlobalScope()) {

+ ServiceWorkerContainerClient* client = static_cast<ServiceWorkerContainerClient*>(WillBeHeapSupplement<WorkerClients>::from(toWorkerGlobalScope(context)->clients(), supplementName()));

+ ASSERT(client);

+ return client;

+ }

ASSERT(context->isWorkerGlobalScope());

return static_cast<ServiceWorkerContainerClient*>(WillBeHeapSupplement<WorkerClients>::from(toWorkerGlobalScope(context)->clients(), supplementName()));

}