third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp - Issue 1954533002: Implement wouldTaintOrigin and expose createPattern for OCRC2D on main thread

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/html/canvas/CanvasRenderingContext.cpp

Issue 1954533002: Implement wouldTaintOrigin and expose createPattern for OCRC2D on main thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: OCRC2D pattern is working fine in GPU; remove Failure mark in TestExpectations Created 4 years, 7 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/html/canvas/CanvasRenderingContext.h ('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/core/html/canvas/CanvasRenderingContext.cpp

diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp

index 17c1e8141a4f7ca44c039811abf997ab3a304a68..fc9536545f53274c6cdfb7cb46af643c6a3aece5 100644

--- a/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp

+++ b/third_party/WebKit/Source/core/html/canvas/CanvasRenderingContext.cpp

@@ -60,7 +60,7 @@ CanvasRenderingContext::ContextType CanvasRenderingContext::resolveContextTypeAl

return type;

}

-bool CanvasRenderingContext::wouldTaintOrigin(CanvasImageSource* imageSource)

+bool CanvasRenderingContext::wouldTaintOrigin(CanvasImageSource* imageSource, SecurityOrigin* destinationSecurityOrigin)

{

const KURL& sourceURL = imageSource->sourceURL();

bool hasURL = (sourceURL.isValid() && !sourceURL.isAboutBlankURL());

@@ -72,7 +72,8 @@ bool CanvasRenderingContext::wouldTaintOrigin(CanvasImageSource* imageSource)

return true;

}

- bool taintOrigin = imageSource->wouldTaintOrigin(canvas()->getSecurityOrigin());

+ ASSERT(!canvas() == !!destinationSecurityOrigin); // Must have one or the other

+ bool taintOrigin = imageSource->wouldTaintOrigin(destinationSecurityOrigin ? destinationSecurityOrigin : canvas()->getSecurityOrigin());

if (hasURL) {

if (taintOrigin)