third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp - Issue 2811863002: Move ScriptState::GetExecutionContext (Part 4)

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/core/workers/DedicatedWorkerGlobalScope.cpp

Issue 2811863002: Move ScriptState::GetExecutionContext (Part 4) (Closed)

Patch Set: Fix Document.cpp 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/timing/SharedWorkerPerformance.cpp ('k') | third_party/WebKit/Source/core/workers/InProcessWorkerBase.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp

diff --git a/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp b/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp

index 67f3de6288ac538fa8382ab7e27967fc35b556d4..8250b1971f864ab7555d4ddd1dd9fe0198040252 100644

--- a/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp

+++ b/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp

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

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

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

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

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

#include "core/frame/csp/ContentSecurityPolicy.h"

#include "core/origin_trials/OriginTrialContext.h"

#include "core/workers/DedicatedWorkerThread.h"

@@ -92,7 +93,7 @@ void DedicatedWorkerGlobalScope::postMessage(

ExceptionState& exception_state) {

// Disentangle the port in preparation for sending it to the remote context.

MessagePortChannelArray channels = MessagePort::DisentanglePorts(

- script_state->GetExecutionContext(), ports, exception_state);

+ ExecutionContext::From(script_state), ports, exception_state);

if (exception_state.HadException())

return;

WorkerObjectProxy().PostMessageToWorkerObject(std::move(message),