third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasModules.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/offscreencanvas/OffscreenCanvasModules.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/notifications/ServiceWorkerRegistrationNotifications.cpp ('k') | third_party/WebKit/Source/modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasModules.cpp

diff --git a/third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasModules.cpp b/third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasModules.cpp

index 92e8b6d43f8908926bec7b28f28cfac0ff29477a..9b20958741b447c97f15dc2717d153017b566de9 100644

--- a/third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasModules.cpp

+++ b/third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvasModules.cpp

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

#include "modules/offscreencanvas/OffscreenCanvasModules.h"

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

#include "core/html/canvas/CanvasContextCreationAttributes.h"

#include "core/offscreencanvas/OffscreenCanvas.h"

#include "modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.h"

@@ -26,7 +25,7 @@ void OffscreenCanvasModules::getContext(

// OffscreenCanvas cannot be transferred after getContext, so this execution

// context will always be the right one from here on.

- offscreen_canvas.SetExecutionContext(ExecutionContext::From(script_state));

+ offscreen_canvas.SetExecutionContext(script_state->GetExecutionContext());

CanvasRenderingContext* context =

offscreen_canvas.GetCanvasRenderingContext(script_state, id, attributes);

if (context)