| Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
|
| diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
|
| index 086ede6a51cd68ec8ee054952cd1d5bd6f2f2076..7b3ba481f30119d2b9b8684c39cca289309e3554 100644
|
| --- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
|
| +++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
|
| @@ -101,7 +101,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| GLenum,
|
| ImageData*);
|
| - void texImage2D(GLenum,
|
| + void texImage2D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLsizei,
|
| @@ -111,7 +112,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| HTMLImageElement*,
|
| ExceptionState&);
|
| - void texImage2D(GLenum,
|
| + void texImage2D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLsizei,
|
| @@ -121,7 +123,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| HTMLCanvasElement*,
|
| ExceptionState&);
|
| - void texImage2D(GLenum,
|
| + void texImage2D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLsizei,
|
| @@ -170,7 +173,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| GLenum,
|
| ImageData*);
|
| - void texSubImage2D(GLenum,
|
| + void texSubImage2D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLint,
|
| @@ -180,7 +184,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| HTMLImageElement*,
|
| ExceptionState&);
|
| - void texSubImage2D(GLenum,
|
| + void texSubImage2D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLint,
|
| @@ -190,7 +195,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| HTMLCanvasElement*,
|
| ExceptionState&);
|
| - void texSubImage2D(GLenum,
|
| + void texSubImage2D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLint,
|
| @@ -225,21 +231,24 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| // base class. This is because the above tex{Sub}Image2D() hides the name
|
| // from base class.
|
| void texImage2D(GLenum, GLint, GLint, GLenum, GLenum, ImageData*);
|
| - void texImage2D(GLenum,
|
| + void texImage2D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLenum,
|
| GLenum,
|
| HTMLImageElement*,
|
| ExceptionState&);
|
| - void texImage2D(GLenum,
|
| + void texImage2D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLenum,
|
| GLenum,
|
| HTMLCanvasElement*,
|
| ExceptionState&);
|
| - void texImage2D(GLenum,
|
| + void texImage2D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLenum,
|
| @@ -254,7 +263,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| ImageBitmap*,
|
| ExceptionState&);
|
| void texSubImage2D(GLenum, GLint, GLint, GLint, GLenum, GLenum, ImageData*);
|
| - void texSubImage2D(GLenum,
|
| + void texSubImage2D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLint,
|
| @@ -262,7 +272,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| HTMLImageElement*,
|
| ExceptionState&);
|
| - void texSubImage2D(GLenum,
|
| + void texSubImage2D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLint,
|
| @@ -270,7 +281,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| HTMLCanvasElement*,
|
| ExceptionState&);
|
| - void texSubImage2D(GLenum,
|
| + void texSubImage2D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLint,
|
| @@ -320,7 +332,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| GLenum,
|
| ImageData*);
|
| - void texImage3D(GLenum,
|
| + void texImage3D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLsizei,
|
| @@ -331,7 +344,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| HTMLImageElement*,
|
| ExceptionState&);
|
| - void texImage3D(GLenum,
|
| + void texImage3D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLsizei,
|
| @@ -342,7 +356,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| HTMLCanvasElement*,
|
| ExceptionState&);
|
| - void texImage3D(GLenum,
|
| + void texImage3D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLsizei,
|
| @@ -408,7 +423,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| GLenum,
|
| ImageData*);
|
| - void texSubImage3D(GLenum,
|
| + void texSubImage3D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLint,
|
| @@ -420,7 +436,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| HTMLImageElement*,
|
| ExceptionState&);
|
| - void texSubImage3D(GLenum,
|
| + void texSubImage3D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLint,
|
| @@ -432,7 +449,8 @@ class WebGL2RenderingContextBase : public WebGLRenderingContextBase {
|
| GLenum,
|
| HTMLCanvasElement*,
|
| ExceptionState&);
|
| - void texSubImage3D(GLenum,
|
| + void texSubImage3D(ExecutionContext*,
|
| + GLenum,
|
| GLint,
|
| GLint,
|
| GLint,
|
|
|