| Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
|
| index 38c733308892b777ddc29b8f7c58b5ea58109914..6f3d916666c3be7d573978be4508b2e33bf6fa6c 100644
|
| --- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
|
| +++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
|
| @@ -35,6 +35,7 @@
|
| #include "core/dom/DOMArrayBuffer.h"
|
| #include "core/dom/DOMTypedArray.h"
|
| #include "core/dom/FlexibleArrayBufferView.h"
|
| +#include "core/dom/NotShared.h"
|
| #include "core/dom/TaskRunnerHelper.h"
|
| #include "core/frame/ImageBitmap.h"
|
| #include "core/frame/LocalFrame.h"
|
| @@ -1903,7 +1904,7 @@ void WebGLRenderingContextBase::bufferData(GLenum target,
|
| }
|
|
|
| void WebGLRenderingContextBase::bufferData(GLenum target,
|
| - NotShared<DOMArrayBufferView> data,
|
| + MaybeShared<DOMArrayBufferView> data,
|
| GLenum usage) {
|
| if (isContextLost())
|
| return;
|
| @@ -2083,7 +2084,7 @@ void WebGLRenderingContextBase::compressedTexImage2D(
|
| GLsizei width,
|
| GLsizei height,
|
| GLint border,
|
| - NotShared<DOMArrayBufferView> data) {
|
| + MaybeShared<DOMArrayBufferView> data) {
|
| if (isContextLost())
|
| return;
|
| if (!ValidateTexture2DBinding("compressedTexImage2D", target))
|
| @@ -2103,7 +2104,7 @@ void WebGLRenderingContextBase::compressedTexSubImage2D(
|
| GLsizei width,
|
| GLsizei height,
|
| GLenum format,
|
| - NotShared<DOMArrayBufferView> data) {
|
| + MaybeShared<DOMArrayBufferView> data) {
|
| if (isContextLost())
|
| return;
|
| if (!ValidateTexture2DBinding("compressedTexSubImage2D", target))
|
| @@ -4115,7 +4116,7 @@ void WebGLRenderingContextBase::readPixels(
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView> pixels) {
|
| + MaybeShared<DOMArrayBufferView> pixels) {
|
| ReadPixelsHelper(x, y, width, height, format, type, pixels.View(), 0);
|
| }
|
|
|
| @@ -4732,7 +4733,7 @@ void WebGLRenderingContextBase::texImage2D(
|
| GLint border,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView> pixels) {
|
| + MaybeShared<DOMArrayBufferView> pixels) {
|
| TexImageHelperDOMArrayBufferView(kTexImage2D, target, level, internalformat,
|
| width, height, 1, border, format, type, 0, 0,
|
| 0, pixels.View(), kNullAllowed, 0);
|
| @@ -5567,7 +5568,7 @@ void WebGLRenderingContextBase::texSubImage2D(
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView> pixels) {
|
| + MaybeShared<DOMArrayBufferView> pixels) {
|
| TexImageHelperDOMArrayBufferView(kTexSubImage2D, target, level, 0, width,
|
| height, 1, 0, format, type, xoffset, yoffset,
|
| 0, pixels.View(), kNullNotAllowed, 0);
|
| @@ -5924,7 +5925,7 @@ void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location,
|
| void WebGLRenderingContextBase::uniformMatrix2fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> v) {
|
| + MaybeShared<DOMFloat32Array> v) {
|
| if (isContextLost() ||
|
| !ValidateUniformMatrixParameters("uniformMatrix2fv", location, transpose,
|
| v.View(), 4, 0, v.View()->length()))
|
| @@ -5948,7 +5949,7 @@ void WebGLRenderingContextBase::uniformMatrix2fv(
|
| void WebGLRenderingContextBase::uniformMatrix3fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> v) {
|
| + MaybeShared<DOMFloat32Array> v) {
|
| if (isContextLost() ||
|
| !ValidateUniformMatrixParameters("uniformMatrix3fv", location, transpose,
|
| v.View(), 9, 0, v.View()->length()))
|
| @@ -5972,7 +5973,7 @@ void WebGLRenderingContextBase::uniformMatrix3fv(
|
| void WebGLRenderingContextBase::uniformMatrix4fv(
|
| const WebGLUniformLocation* location,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> v) {
|
| + MaybeShared<DOMFloat32Array> v) {
|
| if (isContextLost() ||
|
| !ValidateUniformMatrixParameters("uniformMatrix4fv", location, transpose,
|
| v.View(), 16, 0, v.View()->length()))
|
| @@ -6036,7 +6037,7 @@ void WebGLRenderingContextBase::vertexAttrib1f(GLuint index, GLfloat v0) {
|
|
|
| void WebGLRenderingContextBase::vertexAttrib1fv(
|
| GLuint index,
|
| - NotShared<const DOMFloat32Array> v) {
|
| + MaybeShared<const DOMFloat32Array> v) {
|
| if (isContextLost())
|
| return;
|
| if (!v.View() || v.View()->length() < 1) {
|
| @@ -6070,7 +6071,7 @@ void WebGLRenderingContextBase::vertexAttrib2f(GLuint index,
|
|
|
| void WebGLRenderingContextBase::vertexAttrib2fv(
|
| GLuint index,
|
| - NotShared<const DOMFloat32Array> v) {
|
| + MaybeShared<const DOMFloat32Array> v) {
|
| if (isContextLost())
|
| return;
|
| if (!v.View() || v.View()->length() < 2) {
|
| @@ -6105,7 +6106,7 @@ void WebGLRenderingContextBase::vertexAttrib3f(GLuint index,
|
|
|
| void WebGLRenderingContextBase::vertexAttrib3fv(
|
| GLuint index,
|
| - NotShared<const DOMFloat32Array> v) {
|
| + MaybeShared<const DOMFloat32Array> v) {
|
| if (isContextLost())
|
| return;
|
| if (!v.View() || v.View()->length() < 3) {
|
| @@ -6141,7 +6142,7 @@ void WebGLRenderingContextBase::vertexAttrib4f(GLuint index,
|
|
|
| void WebGLRenderingContextBase::vertexAttrib4fv(
|
| GLuint index,
|
| - NotShared<const DOMFloat32Array> v) {
|
| + MaybeShared<const DOMFloat32Array> v) {
|
| if (isContextLost())
|
| return;
|
| if (!v.View() || v.View()->length() < 4) {
|
|
|