third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp - Issue 2805683005: Merge SecurityOrigin::canAccessCheckSuborigins into canAccess

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: third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp

Issue 2805683005: Merge SecurityOrigin::canAccessCheckSuborigins into canAccess (Closed)

Patch Set: Created 3 years, 8 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 | « third_party/WebKit/Source/core/frame/DOMWindow.cpp ('k') | third_party/WebKit/Source/platform/weborigin/SecurityOrigin.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp

diff --git a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp

index b3194623a417ce2f5edbc823c476a67b017a40b1..57aa8f79b9e92003452e919b6bbedf75ccf3ba70 100644

--- a/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp

+++ b/third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp

@@ -57,7 +57,7 @@ ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(

ExceptionState& exceptionState) {

ExecutionContext* executionContext = scriptState->getExecutionContext();

DCHECK(!navigator.frame() ||

- executionContext->getSecurityOrigin()->canAccessCheckSuborigins(

+ executionContext->getSecurityOrigin()->canAccess(

navigator.frame()->securityContext()->getSecurityOrigin()));

return NavigatorServiceWorker::from(navigator).serviceWorker(

navigator.frame(), exceptionState);

@@ -69,7 +69,7 @@ ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(

String& errorMessage) {