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

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h

Issue 2806803003: Make OffscreenCanvas WebGL(2) context consider taintedness of image source (Closed)
Patch Set: rebase 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
Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
index 45a8a20a36bce701e1a0db1a4ff7b1dca3225600..043f2ba644516a1383ffeb8b77df012d052ac751 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
@@ -352,21 +352,24 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
GLenum format,
GLenum type,
ImageData*);
- void texImage2D(GLenum target,
+ void texImage2D(ExecutionContext*,
+ GLenum target,
GLint level,
GLint internalformat,
GLenum format,
GLenum type,
HTMLImageElement*,
ExceptionState&);
- void texImage2D(GLenum target,
+ void texImage2D(ExecutionContext*,
+ GLenum target,
GLint level,
GLint internalformat,
GLenum format,
GLenum type,
HTMLCanvasElement*,
ExceptionState&);
- void texImage2D(GLenum target,
+ void texImage2D(ExecutionContext*,
+ GLenum target,
GLint level,
GLint internalformat,
GLenum format,
@@ -400,7 +403,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
GLenum format,
GLenum type,
ImageData*);
- void texSubImage2D(GLenum target,
+ void texSubImage2D(ExecutionContext*,
+ GLenum target,
GLint level,
GLint xoffset,
GLint yoffset,
@@ -408,7 +412,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
GLenum type,
HTMLImageElement*,
ExceptionState&);
- void texSubImage2D(GLenum target,
+ void texSubImage2D(ExecutionContext*,
+ GLenum target,
GLint level,
GLint xoffset,
GLint yoffset,
@@ -416,7 +421,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
GLenum type,
HTMLCanvasElement*,
ExceptionState&);
- void texSubImage2D(GLenum target,
+ void texSubImage2D(ExecutionContext*,
+ GLenum target,
GLint level,
GLint xoffset,
GLint yoffset,
@@ -1147,7 +1153,7 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
WebGLTexture* ValidateTextureBinding(const char* function_name,
GLenum target);
- // Wrapper function for validateTexture2D(3D)Binding, used in texImageHelper
+ // Wrapper function for validateTexture2D(3D)Binding, used in TexImageHelper
// functions.
virtual WebGLTexture* ValidateTexImageBinding(const char*,
TexImageFunctionID,
@@ -1412,19 +1418,23 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
// Helper function for tex{Sub}Image2D to make sure image is ready and
// wouldn't taint Origin.
- bool ValidateHTMLImageElement(const char* function_name,
+
+ bool ValidateHTMLImageElement(SecurityOrigin*,
+ const char* function_name,
HTMLImageElement*,
ExceptionState&);
// Helper function for tex{Sub}Image2D to make sure canvas is ready and
// wouldn't taint Origin.
- bool ValidateHTMLCanvasElement(const char* function_name,
+ bool ValidateHTMLCanvasElement(SecurityOrigin*,
+ const char* function_name,
HTMLCanvasElement*,
ExceptionState&);
// Helper function for tex{Sub}Image2D to make sure video is ready wouldn't
// taint Origin.
- bool ValidateHTMLVideoElement(const char* function_name,
+ bool ValidateHTMLVideoElement(SecurityOrigin*,
+ const char* function_name,
HTMLVideoElement*,
ExceptionState&);
@@ -1560,7 +1570,9 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
ImageData*,
const IntRect&,
GLint);
- void TexImageHelperHTMLImageElement(TexImageFunctionID,
+
+ void TexImageHelperHTMLImageElement(SecurityOrigin*,
+ TexImageFunctionID,
GLenum,
GLint,
GLint,
@@ -1574,7 +1586,9 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
GLsizei,
GLint,
ExceptionState&);
- void TexImageHelperHTMLCanvasElement(TexImageFunctionID,
+
+ void TexImageHelperHTMLCanvasElement(SecurityOrigin*,
+ TexImageFunctionID,
GLenum,
GLint,
GLint,
@@ -1588,7 +1602,9 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
GLsizei,
GLint,
ExceptionState&);
- void TexImageHelperHTMLVideoElement(TexImageFunctionID,
+
+ void TexImageHelperHTMLVideoElement(SecurityOrigin*,
+ TexImageFunctionID,
GLenum,
GLint,
GLint,

Powered by Google App Engine
This is Rietveld 408576698