third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp - Issue 2821443002: Revert of Move ScriptState::GetExecutionContext (Part 5)

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 2821443002: Revert of Move ScriptState::GetExecutionContext (Part 5) (Closed)

Patch Set: Revert 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/modules/serviceworkers/InstallEvent.cpp ('k') | third_party/WebKit/Source/modules/serviceworkers/ServiceWorker.cpp » ('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 7efc1f2e437a06776cafce0347a541e23a38aa7d..0f1f3e2b1e04908370e381d934549ad0cfdc9908 100644

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

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

@@ -6,7 +6,6 @@

#include "bindings/core/v8/ScriptState.h"

#include "core/dom/Document.h"

-#include "core/dom/ExecutionContext.h"

#include "core/frame/LocalDOMWindow.h"

#include "core/frame/LocalFrame.h"

#include "core/frame/Navigator.h"

@@ -55,7 +54,7 @@ ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(

ScriptState* script_state,

Navigator& navigator,

ExceptionState& exception_state) {

- ExecutionContext* execution_context = ExecutionContext::From(script_state);

+ ExecutionContext* execution_context = script_state->GetExecutionContext();

DCHECK(!navigator.GetFrame() ||

execution_context->GetSecurityOrigin()->CanAccess(

navigator.GetFrame()->GetSecurityContext()->GetSecurityOrigin()));

@@ -67,7 +66,7 @@ ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(