| Index: modules/webgl/WebGLRenderingContextBase.idl
|
| diff --git a/modules/webgl/WebGLRenderingContextBase.idl b/modules/webgl/WebGLRenderingContextBase.idl
|
| index d0a3dd1878e749ede4ec16a7779c4a74e5508c16..2bad45cb37d51a83ad62b7307ebe84c5fc399757 100644
|
| --- a/modules/webgl/WebGLRenderingContextBase.idl
|
| +++ b/modules/webgl/WebGLRenderingContextBase.idl
|
| @@ -41,11 +41,10 @@ typedef unrestricted float GLfloat;
|
| typedef unrestricted float GLclampf;
|
|
|
| [
|
| - // FIXME: [DoNotCheckConstants] and [TypeChecking=Interface] should be applied
|
| - // to members and not need to be put on implementing interface
|
| + // FIXME: [DoNotCheckConstants] should be applied to members and not need to
|
| + // be put on implementing interface
|
| // DoNotCheckConstants, // need to put on implementing interface
|
| NoInterfaceObject, // Always used on target of 'implements'
|
| - // TypeChecking=Interface, // need to put on implementing interface
|
| WillBeGarbageCollected,
|
| ] interface WebGLRenderingContextBase {
|
|
|
| @@ -474,12 +473,12 @@ typedef unrestricted float GLclampf;
|
| readonly attribute GLsizei drawingBufferHeight;
|
|
|
| void activeTexture(GLenum texture);
|
| - void attachShader(WebGLProgram? program, WebGLShader? shader);
|
| + [CallWith=ScriptState] void attachShader(WebGLProgram? program, WebGLShader? shader);
|
| void bindAttribLocation(WebGLProgram? program, GLuint index, DOMString name);
|
| - void bindBuffer(GLenum target, WebGLBuffer? buffer);
|
| - void bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer);
|
| - void bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer);
|
| - void bindTexture(GLenum target, WebGLTexture? texture);
|
| + [CallWith=ScriptState] void bindBuffer(GLenum target, WebGLBuffer? buffer);
|
| + [CallWith=ScriptState] void bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer);
|
| + [CallWith=ScriptState] void bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer);
|
| + [CallWith=ScriptState] void bindTexture(GLenum target, WebGLTexture? texture);
|
| void blendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
|
| void blendEquation(GLenum mode);
|
| void blendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
|
| @@ -490,7 +489,7 @@ typedef unrestricted float GLclampf;
|
| void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
|
| void bufferData(GLenum target, ArrayBufferView data, GLenum usage);
|
| void bufferData(GLenum target, ArrayBuffer? data, GLenum usage);
|
| - void bufferSubData(GLenum target, GLintptr offset, ArrayBufferView data);
|
| + void bufferSubData(GLenum target, GLintptr offset, [FlexibleArrayBufferView] ArrayBufferView data);
|
| void bufferSubData(GLenum target, GLintptr offset, ArrayBuffer? data);
|
|
|
| GLenum checkFramebufferStatus(GLenum target);
|
| @@ -502,9 +501,9 @@ typedef unrestricted float GLclampf;
|
| void compileShader(WebGLShader? shader);
|
|
|
| void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
|
| - GLsizei width, GLsizei height, GLint border, ArrayBufferView? data);
|
| + GLsizei width, GLsizei height, GLint border, ArrayBufferView data);
|
| void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
|
| - GLsizei width, GLsizei height, GLenum format, ArrayBufferView? data);
|
| + GLsizei width, GLsizei height, GLenum format, ArrayBufferView data);
|
|
|
| void copyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
|
| void copyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
|
| @@ -528,7 +527,7 @@ typedef unrestricted float GLclampf;
|
| void depthFunc(GLenum func);
|
| void depthMask(GLboolean flag);
|
| void depthRange(GLclampf zNear, GLclampf zFar);
|
| - void detachShader(WebGLProgram? program, WebGLShader? shader);
|
| + [CallWith=ScriptState] void detachShader(WebGLProgram? program, WebGLShader? shader);
|
| void disable(GLenum cap);
|
| void disableVertexAttribArray(GLuint index);
|
| void drawArrays(GLenum mode, GLint first, GLsizei count);
|
| @@ -538,8 +537,8 @@ typedef unrestricted float GLclampf;
|
| void enableVertexAttribArray(GLuint index);
|
| void finish();
|
| void flush();
|
| - void framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, WebGLRenderbuffer? renderbuffer);
|
| - void framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, WebGLTexture? texture, GLint level);
|
| + [CallWith=ScriptState] void framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, WebGLRenderbuffer? renderbuffer);
|
| + [CallWith=ScriptState] void framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, WebGLTexture? texture, GLint level);
|
| void frontFace(GLenum mode);
|
| void generateMipmap(GLenum target);
|
|
|
| @@ -581,7 +580,7 @@ typedef unrestricted float GLclampf;
|
|
|
| [CallWith=ScriptState] any getVertexAttrib(GLuint index, GLenum pname);
|
|
|
| - GLsizeiptr getVertexAttribOffset(GLuint index, GLenum pname);
|
| + GLintptr getVertexAttribOffset(GLuint index, GLenum pname);
|
|
|
| void hint(GLenum target, GLenum mode);
|
| GLboolean isBuffer(WebGLBuffer? buffer);
|
| @@ -616,28 +615,31 @@ typedef unrestricted float GLclampf;
|
| // Supported forms:
|
| // FIXME: should be union type
|
| // https://www.khronos.org/bugzilla/show_bug.cgi?id=1172
|
| - [RaisesException] void texImage2D(
|
| - GLenum target, GLint level, GLenum internalformat,
|
| + void texImage2D(
|
| + GLenum target, GLint level, GLint internalformat,
|
| GLsizei width, GLsizei height, GLint border,
|
| GLenum format, GLenum type, ArrayBufferView? pixels);
|
| - [RaisesException] void texImage2D(
|
| - GLenum target, GLint level, GLenum internalformat,
|
| + void texImage2D(
|
| + GLenum target, GLint level, GLint internalformat,
|
| GLenum format, GLenum type, ImageData? pixels);
|
| [RaisesException] void texImage2D(
|
| - GLenum target, GLint level, GLenum internalformat,
|
| + GLenum target, GLint level, GLint internalformat,
|
| GLenum format, GLenum type, HTMLImageElement image);
|
| [RaisesException] void texImage2D(
|
| - GLenum target, GLint level, GLenum internalformat,
|
| + GLenum target, GLint level, GLint internalformat,
|
| GLenum format, GLenum type, HTMLCanvasElement canvas);
|
| [RaisesException] void texImage2D(
|
| - GLenum target, GLint level, GLenum internalformat,
|
| + GLenum target, GLint level, GLint internalformat,
|
| GLenum format, GLenum type, HTMLVideoElement video);
|
| + [RaisesException] void texImage2D(
|
| + GLenum target, GLint level, GLint internalformat,
|
| + GLenum format, GLenum type, ImageBitmap bitmap);
|
|
|
| - [RaisesException] void texSubImage2D(
|
| + void texSubImage2D(
|
| GLenum target, GLint level, GLint xoffset, GLint yoffset,
|
| GLsizei width, GLsizei height,
|
| GLenum format, GLenum type, ArrayBufferView? pixels);
|
| - [RaisesException] void texSubImage2D(
|
| + void texSubImage2D(
|
| GLenum target, GLint level, GLint xoffset, GLint yoffset,
|
| GLenum format, GLenum type, ImageData? pixels);
|
| [RaisesException] void texSubImage2D(
|
| @@ -649,30 +651,33 @@ typedef unrestricted float GLclampf;
|
| [RaisesException] void texSubImage2D(
|
| GLenum target, GLint level, GLint xoffset, GLint yoffset,
|
| GLenum format, GLenum type, HTMLVideoElement video);
|
| + [RaisesException] void texSubImage2D(
|
| + GLenum target, GLint level, GLint xoffset, GLint yoffset,
|
| + GLenum format, GLenum type, ImageBitmap bitmap);
|
|
|
| void uniform1f(WebGLUniformLocation? location, GLfloat x);
|
| - void uniform1fv(WebGLUniformLocation? location, Float32Array v);
|
| + void uniform1fv(WebGLUniformLocation? location, [FlexibleArrayBufferView] Float32Array v);
|
| void uniform1fv(WebGLUniformLocation? location, sequence<GLfloat> v);
|
| void uniform1i(WebGLUniformLocation? location, GLint x);
|
| - void uniform1iv(WebGLUniformLocation? location, Int32Array v);
|
| + void uniform1iv(WebGLUniformLocation? location, [FlexibleArrayBufferView] Int32Array v);
|
| void uniform1iv(WebGLUniformLocation? location, sequence<GLint> v);
|
| void uniform2f(WebGLUniformLocation? location, GLfloat x, GLfloat y);
|
| - void uniform2fv(WebGLUniformLocation? location, Float32Array v);
|
| + void uniform2fv(WebGLUniformLocation? location, [FlexibleArrayBufferView] Float32Array v);
|
| void uniform2fv(WebGLUniformLocation? location, sequence<GLfloat> v);
|
| void uniform2i(WebGLUniformLocation? location, GLint x, GLint y);
|
| - void uniform2iv(WebGLUniformLocation? location, Int32Array v);
|
| + void uniform2iv(WebGLUniformLocation? location, [FlexibleArrayBufferView] Int32Array v);
|
| void uniform2iv(WebGLUniformLocation? location, sequence<GLint> v);
|
| void uniform3f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z);
|
| - void uniform3fv(WebGLUniformLocation? location, Float32Array v);
|
| + void uniform3fv(WebGLUniformLocation? location, [FlexibleArrayBufferView] Float32Array v);
|
| void uniform3fv(WebGLUniformLocation? location, sequence<GLfloat> v);
|
| void uniform3i(WebGLUniformLocation? location, GLint x, GLint y, GLint z);
|
| - void uniform3iv(WebGLUniformLocation? location, Int32Array v);
|
| + void uniform3iv(WebGLUniformLocation? location, [FlexibleArrayBufferView] Int32Array v);
|
| void uniform3iv(WebGLUniformLocation? location, sequence<GLint> v);
|
| void uniform4f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
|
| - void uniform4fv(WebGLUniformLocation? location, Float32Array v);
|
| + void uniform4fv(WebGLUniformLocation? location, [FlexibleArrayBufferView] Float32Array v);
|
| void uniform4fv(WebGLUniformLocation? location, sequence<GLfloat> v);
|
| void uniform4i(WebGLUniformLocation? location, GLint x, GLint y, GLint z, GLint w);
|
| - void uniform4iv(WebGLUniformLocation? location, Int32Array v);
|
| + void uniform4iv(WebGLUniformLocation? location, [FlexibleArrayBufferView] Int32Array v);
|
| void uniform4iv(WebGLUniformLocation? location, sequence<GLint> v);
|
|
|
| void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array array);
|
| @@ -682,7 +687,7 @@ typedef unrestricted float GLclampf;
|
| void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array array);
|
| void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> array);
|
|
|
| - void useProgram(WebGLProgram? program);
|
| + [CallWith=ScriptState] void useProgram(WebGLProgram? program);
|
| void validateProgram(WebGLProgram? program);
|
|
|
| void vertexAttrib1f(GLuint indx, GLfloat x);
|
| @@ -697,8 +702,8 @@ typedef unrestricted float GLclampf;
|
| void vertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
|
| void vertexAttrib4fv(GLuint indx, Float32Array values);
|
| void vertexAttrib4fv(GLuint indx, sequence<GLfloat> values);
|
| - void vertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized,
|
| - GLsizei stride, GLintptr offset);
|
| + [CallWith=ScriptState] void vertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized,
|
| + GLsizei stride, GLintptr offset);
|
|
|
| void viewport(GLint x, GLint y, GLsizei width, GLsizei height);
|
| };
|
|
|