| Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
|
| diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
|
| index 3a7af8ee9103a593442201e5c7f92da5fefa32d0..c498e06ba40d941f43a614388239c6a3312cee12 100644
|
| --- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
|
| +++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
|
| @@ -34,8 +34,8 @@
|
| #include "bindings/core/v8/ScriptWrappable.h"
|
| #include "bindings/core/v8/ScriptWrappableVisitor.h"
|
| #include "core/CoreExport.h"
|
| +#include "core/dom/ArrayBufferViewHelpers.h"
|
| #include "core/dom/DOMTypedArray.h"
|
| -#include "core/dom/NotShared.h"
|
| #include "core/dom/TypedFlexibleArrayBufferView.h"
|
| #include "core/html/canvas/CanvasContextCreationAttributes.h"
|
| #include "core/html/canvas/CanvasRenderingContext.h"
|
| @@ -168,7 +168,7 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| void bufferData(GLenum target, long long size, GLenum usage);
|
| void bufferData(GLenum target, DOMArrayBuffer* data, GLenum usage);
|
| void bufferData(GLenum target,
|
| - NotShared<DOMArrayBufferView> data,
|
| + MaybeShared<DOMArrayBufferView> data,
|
| GLenum usage);
|
| void bufferSubData(GLenum target, long long offset, DOMArrayBuffer* data);
|
| void bufferSubData(GLenum target,
|
| @@ -192,7 +192,7 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| GLsizei width,
|
| GLsizei height,
|
| GLint border,
|
| - NotShared<DOMArrayBufferView> data);
|
| + MaybeShared<DOMArrayBufferView> data);
|
| void compressedTexSubImage2D(GLenum target,
|
| GLint level,
|
| GLint xoffset,
|
| @@ -200,7 +200,7 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| GLsizei width,
|
| GLsizei height,
|
| GLenum format,
|
| - NotShared<DOMArrayBufferView> data);
|
| + MaybeShared<DOMArrayBufferView> data);
|
|
|
| void copyTexImage2D(GLenum target,
|
| GLint level,
|
| @@ -325,7 +325,7 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView> pixels);
|
| + MaybeShared<DOMArrayBufferView> pixels);
|
| void renderbufferStorage(GLenum target,
|
| GLenum internalformat,
|
| GLsizei width,
|
| @@ -348,7 +348,7 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| GLint border,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView>);
|
| + MaybeShared<DOMArrayBufferView>);
|
| void texImage2D(GLenum target,
|
| GLint level,
|
| GLint internalformat,
|
| @@ -398,7 +398,7 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - NotShared<DOMArrayBufferView>);
|
| + MaybeShared<DOMArrayBufferView>);
|
| void texSubImage2D(GLenum target,
|
| GLint level,
|
| GLint xoffset,
|
| @@ -476,19 +476,19 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| void uniform4iv(const WebGLUniformLocation*, Vector<GLint>&);
|
| void uniformMatrix2fv(const WebGLUniformLocation*,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> value);
|
| + MaybeShared<DOMFloat32Array> value);
|
| void uniformMatrix2fv(const WebGLUniformLocation*,
|
| GLboolean transpose,
|
| Vector<GLfloat>& value);
|
| void uniformMatrix3fv(const WebGLUniformLocation*,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> value);
|
| + MaybeShared<DOMFloat32Array> value);
|
| void uniformMatrix3fv(const WebGLUniformLocation*,
|
| GLboolean transpose,
|
| Vector<GLfloat>& value);
|
| void uniformMatrix4fv(const WebGLUniformLocation*,
|
| GLboolean transpose,
|
| - NotShared<DOMFloat32Array> value);
|
| + MaybeShared<DOMFloat32Array> value);
|
| void uniformMatrix4fv(const WebGLUniformLocation*,
|
| GLboolean transpose,
|
| Vector<GLfloat>& value);
|
| @@ -497,16 +497,16 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| void validateProgram(WebGLProgram*);
|
|
|
| void vertexAttrib1f(GLuint index, GLfloat x);
|
| - void vertexAttrib1fv(GLuint index, NotShared<const DOMFloat32Array> values);
|
| + void vertexAttrib1fv(GLuint index, MaybeShared<const DOMFloat32Array> values);
|
| void vertexAttrib1fv(GLuint index, const Vector<GLfloat>& values);
|
| void vertexAttrib2f(GLuint index, GLfloat x, GLfloat y);
|
| - void vertexAttrib2fv(GLuint index, NotShared<const DOMFloat32Array> values);
|
| + void vertexAttrib2fv(GLuint index, MaybeShared<const DOMFloat32Array> values);
|
| void vertexAttrib2fv(GLuint index, const Vector<GLfloat>& values);
|
| void vertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z);
|
| - void vertexAttrib3fv(GLuint index, NotShared<const DOMFloat32Array> values);
|
| + void vertexAttrib3fv(GLuint index, MaybeShared<const DOMFloat32Array> values);
|
| void vertexAttrib3fv(GLuint index, const Vector<GLfloat>& values);
|
| void vertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
|
| - void vertexAttrib4fv(GLuint index, NotShared<const DOMFloat32Array> values);
|
| + void vertexAttrib4fv(GLuint index, MaybeShared<const DOMFloat32Array> values);
|
| void vertexAttrib4fv(GLuint index, const Vector<GLfloat>& values);
|
| void vertexAttribPointer(GLuint index,
|
| GLint size,
|
|
|