third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp - Issue 1577783003: Revert of Add a origin clean flag in ImageBitmap class

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/HTMLCanvasElement.cpp

Issue 1577783003: Revert of Add a origin clean flag in ImageBitmap class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/frame/ImageBitmapTest.cpp ('k') | third_party/WebKit/Source/core/html/HTMLImageElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

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

index 07a62ea5587f2ff592a812e4e0c7b9b6349a9656..11eb39f893780a61a2d318887a1b6bf8c3fbf8b7 100644

--- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

@@ -1003,6 +1003,10 @@

ScriptPromise HTMLCanvasElement::createImageBitmap(ScriptState* scriptState, EventTarget& eventTarget, int sx, int sy, int sw, int sh, ExceptionState& exceptionState)

{

ASSERT(eventTarget.toDOMWindow());

+ if (!originClean()) {

+ exceptionState.throwSecurityError("The canvas element provided is tainted with cross-origin data.");

+ return ScriptPromise();

+ }

if (!sw || !sh) {

exceptionState.throwDOMException(IndexSizeError, String::format("The source %s provided is 0.", sw ? "height" : "width"));

return ScriptPromise();