third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.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/canvas2d/BaseRenderingContext2D.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/cachestorage/CacheTest.cpp ('k') | third_party/WebKit/Source/modules/compositorworker/CompositorWorkerGlobalScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

diff --git a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

index 44ccdb3c9b161ec4abbb310eeca399318120e32c..a348ef06db6c6e6d72e4cf594580d66420d1f3c6 100644

--- a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

+++ b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

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

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

#include "core/css/cssom/CSSURLImageValue.h"

#include "core/css/parser/CSSParser.h"

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

#include "core/dom/NotShared.h"

#include "core/frame/ImageBitmap.h"

#include "core/html/HTMLCanvasElement.h"

@@ -1355,7 +1354,7 @@ void BaseRenderingContext2D::drawImage(ScriptState* script_state,

}

if (OriginClean() &&

- WouldTaintOrigin(image_source, ExecutionContext::From(script_state)))

+ WouldTaintOrigin(image_source, script_state->GetExecutionContext()))

SetOriginTainted();

}

@@ -1470,7 +1469,7 @@ CanvasPattern* BaseRenderingContext2D::createPattern(

DCHECK(image_for_rendering);

bool origin_clean =

- !WouldTaintOrigin(image_source, ExecutionContext::From(script_state));

+ !WouldTaintOrigin(image_source, script_state->GetExecutionContext());

return CanvasPattern::Create(image_for_rendering.Release(), repeat_mode,

origin_clean);