Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(866)

Unified Diff: Source/core/html/canvas/WebGLRenderingContextBase.cpp

Issue 181693006: Refactoring source image usage in CanvasRenderingContext2D (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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
Index: Source/core/html/canvas/WebGLRenderingContextBase.cpp
diff --git a/Source/core/html/canvas/WebGLRenderingContextBase.cpp b/Source/core/html/canvas/WebGLRenderingContextBase.cpp
index 802cec44c6feb71d318e5cb60cbb1be8826ceacf..beddb2699306d90f0fe6e0cf76f652b86450684d 100644
--- a/Source/core/html/canvas/WebGLRenderingContextBase.cpp
+++ b/Source/core/html/canvas/WebGLRenderingContextBase.cpp
@@ -5091,7 +5091,7 @@ bool WebGLRenderingContextBase::validateHTMLImageElement(const char* functionNam
synthesizeGLError(GL_INVALID_VALUE, functionName, "invalid image");
return false;
}
- if (wouldTaintOrigin(image)) {
+ if (image->wouldTaintOrigin(this)) {
exceptionState.throwSecurityError("The cross-origin image at " + url.elidedString() + " may not be loaded.");
return false;
}
@@ -5104,7 +5104,7 @@ bool WebGLRenderingContextBase::validateHTMLCanvasElement(const char* functionNa
synthesizeGLError(GL_INVALID_VALUE, functionName, "no canvas");
return false;
}
- if (wouldTaintOrigin(canvas)) {
+ if (canvas->wouldTaintOrigin(this)) {
exceptionState.throwSecurityError("Tainted canvases may not be loaded.");
return false;
}
@@ -5117,7 +5117,7 @@ bool WebGLRenderingContextBase::validateHTMLVideoElement(const char* functionNam
synthesizeGLError(GL_INVALID_VALUE, functionName, "no video");
return false;
}
- if (wouldTaintOrigin(video)) {
+ if (video->wouldTaintOrigin(this)) {
exceptionState.throwSecurityError("The video element contains cross-origin data, and may not be loaded.");
return false;
}
« Source/core/html/HTMLImageElement.cpp ('K') | « Source/core/html/canvas/CanvasRenderingContext2D.idl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698