| Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
|
| index 9a902001dac684e122478db4de383c8623ee1e3c..7410dec695075a3b37934b30619217e2b2439d15 100644
|
| --- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
|
| +++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
|
| @@ -250,7 +250,7 @@ void WebGL2RenderingContextBase::InitializeNewContext() {
|
|
|
| void WebGL2RenderingContextBase::bufferData(
|
| GLenum target,
|
| - NotShared<DOMArrayBufferView> src_data,
|
| + MaybeShared<DOMArrayBufferView> src_data,
|
| GLenum usage,
|
| GLuint src_offset,
|
| GLuint length) {
|
| @@ -279,16 +279,17 @@ void WebGL2RenderingContextBase::bufferData(GLenum target,
|
| WebGLRenderingContextBase::bufferData(target, data, usage);
|
| }
|
|
|
| -void WebGL2RenderingContextBase::bufferData(GLenum target,
|
| - NotShared<DOMArrayBufferView> data,
|
| - GLenum usage) {
|
| +void WebGL2RenderingContextBase::bufferData(
|
| + GLenum target,
|
| + MaybeShared<DOMArrayBufferView> data,
|
| + GLenum usage) {
|
| WebGLRenderingContextBase::bufferData(target, data, usage);
|
| }
|
|
|
| void WebGL2RenderingContextBase::bufferSubData(
|
| GLenum target,
|
| GLintptr dst_byte_offset,
|
| - NotShared<DOMArrayBufferView> src_data,
|
| + MaybeShared<DOMArrayBufferView> src_data,
|
| GLuint src_offset,
|
| GLuint length) {
|
| if (isContextLost())
|
| @@ -370,7 +371,7 @@ void WebGL2RenderingContextBase::copyBufferSubData(GLenum read_target,
|
| void WebGL2RenderingContextBase::getBufferSubData(
|
| GLenum target,
|
| long long src_byte_offset,
|
| - NotShared<DOMArrayBufferView> dst_data,
|
| + MaybeShared<DOMArrayBufferView> dst_data,
|
| GLuint dst_offset,
|
| GLuint length) {
|
| WebGLBuffer* source_buffer = nullptr;
|
| @@ -759,7 +760,7 @@ void WebGL2RenderingContextBase::readPixels(
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView> pixels) {
|
| + MaybeShared<DOMArrayBufferView> pixels) {
|
| if (isContextLost())
|
| return;
|
| if (bound_pixel_pack_buffer_.Get()) {
|
| @@ -778,7 +779,7 @@ void WebGL2RenderingContextBase::readPixels(
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView> pixels,
|
| + MaybeShared<DOMArrayBufferView> pixels,
|
| GLuint offset) {
|
| if (isContextLost())
|
| return;
|
| @@ -1139,7 +1140,7 @@ void WebGL2RenderingContextBase::texImage2D(
|
| GLint border,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView> data) {
|
| + MaybeShared<DOMArrayBufferView> data) {
|
| if (isContextLost())
|
| return;
|
| if (bound_pixel_unpack_buffer_) {
|
| @@ -1151,16 +1152,17 @@ void WebGL2RenderingContextBase::texImage2D(
|
| height, border, format, type, data);
|
| }
|
|
|
| -void WebGL2RenderingContextBase::texImage2D(GLenum target,
|
| - GLint level,
|
| - GLint internalformat,
|
| - GLsizei width,
|
| - GLsizei height,
|
| - GLint border,
|
| - GLenum format,
|
| - GLenum type,
|
| - NotShared<DOMArrayBufferView> data,
|
| - GLuint src_offset) {
|
| +void WebGL2RenderingContextBase::texImage2D(
|
| + GLenum target,
|
| + GLint level,
|
| + GLint internalformat,
|
| + GLsizei width,
|
| + GLsizei height,
|
| + GLint border,
|
| + GLenum format,
|
| + GLenum type,
|
| + MaybeShared<DOMArrayBufferView> data,
|
| + GLuint src_offset) {
|
| if (isContextLost())
|
| return;
|
| if (bound_pixel_unpack_buffer_) {
|
| @@ -1383,7 +1385,7 @@ void WebGL2RenderingContextBase::texSubImage2D(
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView> pixels) {
|
| + MaybeShared<DOMArrayBufferView> pixels) {
|
| if (isContextLost())
|
| return;
|
| if (bound_pixel_unpack_buffer_) {
|
| @@ -1404,7 +1406,7 @@ void WebGL2RenderingContextBase::texSubImage2D(
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView> pixels,
|
| + MaybeShared<DOMArrayBufferView> pixels,
|
| GLuint src_offset) {
|
| if (isContextLost())
|
| return;
|
| @@ -1666,7 +1668,7 @@ void WebGL2RenderingContextBase::texImage3D(
|
| GLint border,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView> pixels) {
|
| + MaybeShared<DOMArrayBufferView> pixels) {
|
| TexImageHelperDOMArrayBufferView(kTexImage3D, target, level, internalformat,
|
| width, height, depth, border, format, type,
|
| 0, 0, 0, pixels.View(), kNullAllowed, 0);
|
| @@ -1682,7 +1684,7 @@ void WebGL2RenderingContextBase::texImage3D(
|
| GLint border,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView> pixels,
|
| + MaybeShared<DOMArrayBufferView> pixels,
|
| GLuint src_offset) {
|
| if (isContextLost())
|
| return;
|
| @@ -1855,7 +1857,7 @@ void WebGL2RenderingContextBase::texSubImage3D(
|
| GLsizei depth,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView> pixels,
|
| + MaybeShared<DOMArrayBufferView> pixels,
|
| GLuint src_offset) {
|
| if (isContextLost())
|
| return;
|
| @@ -2061,7 +2063,7 @@ void WebGL2RenderingContextBase::compressedTexImage2D(
|
| GLsizei width,
|
| GLsizei height,
|
| GLint border,
|
| - NotShared<DOMArrayBufferView> data) {
|
| + MaybeShared<DOMArrayBufferView> data) {
|
| if (isContextLost())
|
| return;
|
| if (bound_pixel_unpack_buffer_) {
|
| @@ -2080,7 +2082,7 @@ void WebGL2RenderingContextBase::compressedTexImage2D(
|
| GLsizei width,
|
| GLsizei height,
|
| GLint border,
|
| - NotShared<DOMArrayBufferView> data,
|
| + MaybeShared<DOMArrayBufferView> data,
|
| GLuint src_offset,
|
| GLuint src_length_override) {
|
| if (isContextLost())
|
| @@ -2139,7 +2141,7 @@ void WebGL2RenderingContextBase::compressedTexSubImage2D(
|
| GLsizei width,
|
| GLsizei height,
|
| GLenum format,
|
| - NotShared<DOMArrayBufferView> data) {
|
| + MaybeShared<DOMArrayBufferView> data) {
|
| if (isContextLost())
|
| return;
|
| if (bound_pixel_unpack_buffer_) {
|
| @@ -2159,7 +2161,7 @@ void WebGL2RenderingContextBase::compressedTexSubImage2D(
|
| GLsizei width,
|
| GLsizei height,
|
| GLenum format,
|
| - NotShared<DOMArrayBufferView> data,
|
| + MaybeShared<DOMArrayBufferView> data,
|
| GLuint src_offset,
|
| GLuint src_length_override) {
|
| if (isContextLost())
|
| @@ -2220,7 +2222,7 @@ void WebGL2RenderingContextBase::compressedTexImage3D(
|
| GLsizei height,
|
| GLsizei depth,
|
| GLint border,
|
| - NotShared<DOMArrayBufferView> data,
|
| + MaybeShared<DOMArrayBufferView> data,
|
| GLuint src_offset,
|
| GLuint src_length_override) {
|
| if (isContextLost())
|
| @@ -2283,7 +2285,7 @@ void WebGL2RenderingContextBase::compressedTexSubImage3D(
|
| GLsizei height,
|
| GLsizei depth,
|
| GLenum format,
|
| - NotShared<DOMArrayBufferView> data,
|
| + MaybeShared<DOMArrayBufferView> data,
|
| GLuint src_offset,
|
| GLuint src_length_override) {
|
| if (isContextLost())
|
| @@ -2795,7 +2797,7 @@ void WebGL2RenderingContextBase::uniform4uiv(
|
| void WebGL2RenderingContextBase::uniformMatrix2fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> v,
|
| + MaybeShared<DOMFloat32Array> v,
|
| GLuint src_offset,
|
| GLuint src_length) {
|
| if (isContextLost() ||
|
| @@ -2827,7 +2829,7 @@ void WebGL2RenderingContextBase::uniformMatrix2fv(
|
| void WebGL2RenderingContextBase::uniformMatrix3fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> v,
|
| + MaybeShared<DOMFloat32Array> v,
|
| GLuint src_offset,
|
| GLuint src_length) {
|
| if (isContextLost() ||
|
| @@ -2859,7 +2861,7 @@ void WebGL2RenderingContextBase::uniformMatrix3fv(
|
| void WebGL2RenderingContextBase::uniformMatrix4fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> v,
|
| + MaybeShared<DOMFloat32Array> v,
|
| GLuint src_offset,
|
| GLuint src_length) {
|
| if (isContextLost() ||
|
| @@ -2891,7 +2893,7 @@ void WebGL2RenderingContextBase::uniformMatrix4fv(
|
| void WebGL2RenderingContextBase::uniformMatrix2x3fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> value,
|
| + MaybeShared<DOMFloat32Array> value,
|
| GLuint src_offset,
|
| GLuint src_length) {
|
| if (isContextLost() || !ValidateUniformMatrixParameters(
|
| @@ -2924,7 +2926,7 @@ void WebGL2RenderingContextBase::uniformMatrix2x3fv(
|
| void WebGL2RenderingContextBase::uniformMatrix3x2fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> value,
|
| + MaybeShared<DOMFloat32Array> value,
|
| GLuint src_offset,
|
| GLuint src_length) {
|
| if (isContextLost() || !ValidateUniformMatrixParameters(
|
| @@ -2957,7 +2959,7 @@ void WebGL2RenderingContextBase::uniformMatrix3x2fv(
|
| void WebGL2RenderingContextBase::uniformMatrix2x4fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> value,
|
| + MaybeShared<DOMFloat32Array> value,
|
| GLuint src_offset,
|
| GLuint src_length) {
|
| if (isContextLost() || !ValidateUniformMatrixParameters(
|
| @@ -2990,7 +2992,7 @@ void WebGL2RenderingContextBase::uniformMatrix2x4fv(
|
| void WebGL2RenderingContextBase::uniformMatrix4x2fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> value,
|
| + MaybeShared<DOMFloat32Array> value,
|
| GLuint src_offset,
|
| GLuint src_length) {
|
| if (isContextLost() || !ValidateUniformMatrixParameters(
|
| @@ -3023,7 +3025,7 @@ void WebGL2RenderingContextBase::uniformMatrix4x2fv(
|
| void WebGL2RenderingContextBase::uniformMatrix3x4fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> value,
|
| + MaybeShared<DOMFloat32Array> value,
|
| GLuint src_offset,
|
| GLuint src_length) {
|
| if (isContextLost() || !ValidateUniformMatrixParameters(
|
| @@ -3056,7 +3058,7 @@ void WebGL2RenderingContextBase::uniformMatrix3x4fv(
|
| void WebGL2RenderingContextBase::uniformMatrix4x3fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> value,
|
| + MaybeShared<DOMFloat32Array> value,
|
| GLuint src_offset,
|
| GLuint src_length) {
|
| if (isContextLost() || !ValidateUniformMatrixParameters(
|
| @@ -3185,7 +3187,7 @@ void WebGL2RenderingContextBase::uniform4iv(
|
| void WebGL2RenderingContextBase::uniformMatrix2fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> v) {
|
| + MaybeShared<DOMFloat32Array> v) {
|
| WebGLRenderingContextBase::uniformMatrix2fv(location, transpose, v);
|
| }
|
|
|
| @@ -3199,7 +3201,7 @@ void WebGL2RenderingContextBase::uniformMatrix2fv(
|
| void WebGL2RenderingContextBase::uniformMatrix3fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> v) {
|
| + MaybeShared<DOMFloat32Array> v) {
|
| WebGLRenderingContextBase::uniformMatrix3fv(location, transpose, v);
|
| }
|
|
|
| @@ -3213,7 +3215,7 @@ void WebGL2RenderingContextBase::uniformMatrix3fv(
|
| void WebGL2RenderingContextBase::uniformMatrix4fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> v) {
|
| + MaybeShared<DOMFloat32Array> v) {
|
| WebGLRenderingContextBase::uniformMatrix4fv(location, transpose, v);
|
| }
|
|
|
| @@ -3237,7 +3239,7 @@ void WebGL2RenderingContextBase::vertexAttribI4i(GLuint index,
|
|
|
| void WebGL2RenderingContextBase::vertexAttribI4iv(
|
| GLuint index,
|
| - NotShared<const DOMInt32Array> v) {
|
| + MaybeShared<const DOMInt32Array> v) {
|
| if (isContextLost())
|
| return;
|
| if (!v.View() || v.View()->length() < 4) {
|
| @@ -3273,7 +3275,7 @@ void WebGL2RenderingContextBase::vertexAttribI4ui(GLuint index,
|
|
|
| void WebGL2RenderingContextBase::vertexAttribI4uiv(
|
| GLuint index,
|
| - NotShared<const DOMUint32Array> v) {
|
| + MaybeShared<const DOMUint32Array> v) {
|
| if (isContextLost())
|
| return;
|
| if (!v.View() || v.View()->length() < 4) {
|
| @@ -3496,9 +3498,10 @@ WebGLTexture* WebGL2RenderingContextBase::ValidateTexImageBinding(
|
| return ValidateTexture2DBinding(func_name, target);
|
| }
|
|
|
| -void WebGL2RenderingContextBase::clearBufferiv(GLenum buffer,
|
| - GLint drawbuffer,
|
| - NotShared<DOMInt32Array> value) {
|
| +void WebGL2RenderingContextBase::clearBufferiv(
|
| + GLenum buffer,
|
| + GLint drawbuffer,
|
| + MaybeShared<DOMInt32Array> value) {
|
| if (isContextLost() ||
|
| !ValidateClearBuffer("clearBufferiv", buffer, value.View()->length()))
|
| return;
|
| @@ -3519,7 +3522,7 @@ void WebGL2RenderingContextBase::clearBufferiv(GLenum buffer,
|
| void WebGL2RenderingContextBase::clearBufferuiv(
|
| GLenum buffer,
|
| GLint drawbuffer,
|
| - NotShared<DOMUint32Array> value) {
|
| + MaybeShared<DOMUint32Array> value) {
|
| if (isContextLost() ||
|
| !ValidateClearBuffer("clearBufferuiv", buffer, value.View()->length()))
|
| return;
|
| @@ -3540,7 +3543,7 @@ void WebGL2RenderingContextBase::clearBufferuiv(GLenum buffer,
|
| void WebGL2RenderingContextBase::clearBufferfv(
|
| GLenum buffer,
|
| GLint drawbuffer,
|
| - NotShared<DOMFloat32Array> value) {
|
| + MaybeShared<DOMFloat32Array> value) {
|
| if (isContextLost() ||
|
| !ValidateClearBuffer("clearBufferfv", buffer, value.View()->length()))
|
| return;
|
|
|