third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp - Issue 2815313002: Reland 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/ServiceWorkerGlobalScope.cpp

Issue 2815313002: Reland of Move ScriptState::GetExecutionContext (Part 5) (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/modules/serviceworkers/ServiceWorkerContainer.cpp ('k') | third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClient.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a6db17ab3e805a23cc42d348e39a508050a67824..4bcf3d70bcb5955beef8da8131c6657947f793d6 100644

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

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

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

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

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

#include "core/dom/ExceptionCode.h"

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

#include "core/events/Event.h"

#include "core/inspector/ConsoleMessage.h"

#include "core/inspector/WorkerInspectorController.h"

@@ -157,7 +158,7 @@

}

ScriptPromise ServiceWorkerGlobalScope::skipWaiting(ScriptState* script_state) {

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

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

// FIXME: short-term fix, see details at:

// https://codereview.chromium.org/535193002/.

if (!execution_context)