| Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
|
| diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
|
| index 8e793999c6ffe604829481a149a52c8fb08f97e6..5a822d23274cfd94c64b5edda2b4f5bda7015544 100644
|
| --- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
|
| +++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
|
| @@ -277,10 +277,10 @@ typedef unsigned long long GLuint64;
|
| const GLenum MAX_CLIENT_WAIT_TIMEOUT_WEBGL = 0x9247;
|
|
|
| /* Buffer objects */
|
| - void bufferData(GLenum target, ArrayBufferView srcData, GLenum usage, GLuint srcOffset, optional GLuint length = 0);
|
| - void bufferSubData(GLenum target, GLintptr dstByteOffset, ArrayBufferView srcData, GLuint srcOffset, optional GLuint length = 0);
|
| + void bufferData(GLenum target, [AllowShared] ArrayBufferView srcData, GLenum usage, GLuint srcOffset, optional GLuint length = 0);
|
| + void bufferSubData(GLenum target, GLintptr dstByteOffset, [AllowShared] ArrayBufferView srcData, GLuint srcOffset, optional GLuint length = 0);
|
| void copyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
|
| - void getBufferSubData(GLenum target, GLintptr srcByteOffset, ArrayBufferView dstData, optional GLuint dstOffset = 0, optional GLuint length = 0);
|
| + void getBufferSubData(GLenum target, GLintptr srcByteOffset, [AllowShared] ArrayBufferView dstData, optional GLuint dstOffset = 0, optional GLuint length = 0);
|
|
|
| /* Framebuffer objects */
|
| void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
|
| @@ -300,14 +300,14 @@ typedef unsigned long long GLuint64;
|
| [CallWith=ExecutionContext, RaisesException] void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, HTMLCanvasElement canvas);
|
| [CallWith=ExecutionContext,RaisesException] void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, HTMLVideoElement video);
|
| [RaisesException] void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, ImageBitmap bitmap);
|
| - void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, ArrayBufferView srcData, GLuint srcOffset);
|
| + void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, [AllowShared] ArrayBufferView srcData, GLuint srcOffset);
|
| void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLintptr offset);
|
| void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, ImageData data);
|
| [CallWith=ExecutionContext, RaisesException] void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, HTMLImageElement image);
|
| [CallWith=ExecutionContext, RaisesException] void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, HTMLCanvasElement canvas);
|
| [CallWith=ExecutionContext, RaisesException] void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, HTMLVideoElement video);
|
| [RaisesException] void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, ImageBitmap bitmap);
|
| - void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, ArrayBufferView srcData, GLuint srcOffset);
|
| + void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, [AllowShared] ArrayBufferView srcData, GLuint srcOffset);
|
| void texStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
|
| void texStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
|
| void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, GLintptr offset);
|
| @@ -316,28 +316,28 @@ typedef unsigned long long GLuint64;
|
| [CallWith=ExecutionContext, RaisesException] void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, HTMLCanvasElement canvas);
|
| [CallWith=ExecutionContext, RaisesException] void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, HTMLVideoElement video);
|
| [RaisesException] void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, ImageBitmap bitmap);
|
| - void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, ArrayBufferView? pixels);
|
| - void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, ArrayBufferView pixels, GLuint srcOffset);
|
| + void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, [AllowShared] ArrayBufferView? pixels);
|
| + void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, [AllowShared] ArrayBufferView pixels, GLuint srcOffset);
|
| void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLintptr offset);
|
| void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, ImageData data);
|
| [CallWith=ExecutionContext, RaisesException] void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, HTMLImageElement image);
|
| [CallWith=ExecutionContext, RaisesException] void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, HTMLCanvasElement canvas);
|
| [CallWith=ExecutionContext, RaisesException] void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, HTMLVideoElement video);
|
| [RaisesException] void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, ImageBitmap bitmap);
|
| - void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, ArrayBufferView pixels, optional GLuint srcOffset = 0);
|
| + void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, [AllowShared] ArrayBufferView pixels, optional GLuint srcOffset = 0);
|
|
|
| void copyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
|
|
|
| void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
|
| GLsizei width, GLsizei height, GLint border,
|
| - ArrayBufferView data, GLuint srcOffset,
|
| + [AllowShared] ArrayBufferView data, GLuint srcOffset,
|
| optional GLuint srcLengthOverride = 0);
|
| void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
|
| GLsizei width, GLsizei height, GLenum format,
|
| - ArrayBufferView data, GLuint srcOffset,
|
| + [AllowShared] ArrayBufferView data, GLuint srcOffset,
|
| optional GLuint srcLengthOverride = 0);
|
| - void compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, ArrayBufferView data, optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
|
| - void compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, ArrayBufferView data, optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
|
| + void compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, [AllowShared] ArrayBufferView data, optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
|
| + void compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, [AllowShared] ArrayBufferView data, optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
|
|
|
| void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
|
| GLsizei width, GLsizei height, GLint border,
|
| @@ -412,48 +412,48 @@ typedef unsigned long long GLuint64;
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| void uniform4uiv(WebGLUniformLocation? location, sequence<GLuint> v,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| - void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array array,
|
| + void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, [AllowShared] Float32Array array,
|
| GLuint srcOffset, optional GLuint srcLength = 0);
|
| void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> array,
|
| GLuint srcOffset, optional GLuint srcLength = 0);
|
| - void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array array,
|
| + void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, [AllowShared] Float32Array array,
|
| GLuint srcOffset, optional GLuint srcLength = 0);
|
| void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> array,
|
| GLuint srcOffset, optional GLuint srcLength = 0);
|
| - void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array array,
|
| + void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, [AllowShared] Float32Array array,
|
| GLuint srcOffset, optional GLuint srcLength = 0);
|
| void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> array,
|
| GLuint srcOffset, optional GLuint srcLength = 0);
|
| - void uniformMatrix2x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array value,
|
| + void uniformMatrix2x3fv(WebGLUniformLocation? location, GLboolean transpose, [AllowShared] Float32Array value,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| void uniformMatrix2x3fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> value,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| - void uniformMatrix3x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array value,
|
| + void uniformMatrix3x2fv(WebGLUniformLocation? location, GLboolean transpose, [AllowShared] Float32Array value,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| void uniformMatrix3x2fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> value,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| - void uniformMatrix2x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array value,
|
| + void uniformMatrix2x4fv(WebGLUniformLocation? location, GLboolean transpose, [AllowShared] Float32Array value,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| void uniformMatrix2x4fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> value,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| - void uniformMatrix4x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array value,
|
| + void uniformMatrix4x2fv(WebGLUniformLocation? location, GLboolean transpose, [AllowShared] Float32Array value,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| void uniformMatrix4x2fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> value,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| - void uniformMatrix3x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array value,
|
| + void uniformMatrix3x4fv(WebGLUniformLocation? location, GLboolean transpose, [AllowShared] Float32Array value,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| void uniformMatrix3x4fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> value,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| - void uniformMatrix4x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array value,
|
| + void uniformMatrix4x3fv(WebGLUniformLocation? location, GLboolean transpose, [AllowShared] Float32Array value,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
| void uniformMatrix4x3fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> value,
|
| optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
|
|
|
| void vertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w);
|
| - void vertexAttribI4iv(GLuint index, Int32Array v);
|
| + void vertexAttribI4iv(GLuint index, [AllowShared] Int32Array v);
|
| void vertexAttribI4iv(GLuint index, sequence<GLint> v);
|
| void vertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
|
| - void vertexAttribI4uiv(GLuint index, Uint32Array v);
|
| + void vertexAttribI4uiv(GLuint index, [AllowShared] Uint32Array v);
|
| void vertexAttribI4uiv(GLuint index, sequence<GLuint> v);
|
| void vertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
|
|
|
| @@ -465,11 +465,11 @@ typedef unsigned long long GLuint64;
|
|
|
| /* Multiple Render Targets */
|
| void drawBuffers(sequence<GLenum> buffers);
|
| - void clearBufferiv(GLenum buffer, GLint drawbuffer, Int32Array value, optional GLuint srcOffset = 0);
|
| + void clearBufferiv(GLenum buffer, GLint drawbuffer, [AllowShared] Int32Array value, optional GLuint srcOffset = 0);
|
| void clearBufferiv(GLenum buffer, GLint drawbuffer, sequence<GLint> value, optional GLuint srcOffset = 0);
|
| - void clearBufferuiv(GLenum buffer, GLint drawbuffer, Uint32Array value, optional GLuint srcOffset = 0);
|
| + void clearBufferuiv(GLenum buffer, GLint drawbuffer, [AllowShared] Uint32Array value, optional GLuint srcOffset = 0);
|
| void clearBufferuiv(GLenum buffer, GLint drawbuffer, sequence<GLuint> value, optional GLuint srcOffset = 0);
|
| - void clearBufferfv(GLenum buffer, GLint drawbuffer, Float32Array value, optional GLuint srcOffset = 0);
|
| + void clearBufferfv(GLenum buffer, GLint drawbuffer, [AllowShared] Float32Array value, optional GLuint srcOffset = 0);
|
| void clearBufferfv(GLenum buffer, GLint drawbuffer, sequence<GLfloat> value, optional GLuint srcOffset = 0);
|
| void clearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
|
|
|
| @@ -530,7 +530,7 @@ typedef unsigned long long GLuint64;
|
| void bindVertexArray(WebGLVertexArrayObject? vertexArray);
|
|
|
| /* Reading */
|
| - void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, ArrayBufferView dstData, GLintptr offset);
|
| + void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, [AllowShared] ArrayBufferView dstData, GLintptr offset);
|
| void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLintptr offset);
|
| };
|
| WebGL2RenderingContextBase implements WebGLRenderingContextBase;
|
|
|