| 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 45a8a20a36bce701e1a0db1a4ff7b1dca3225600..5c34932d828914cbcd5c56e1522f71653a22cbcf 100644
|
| --- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
|
| +++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
|
| @@ -26,6 +26,8 @@
|
| #ifndef WebGLRenderingContextBase_h
|
| #define WebGLRenderingContextBase_h
|
|
|
| +#include <memory>
|
| +#include <set>
|
| #include "bindings/core/v8/Nullable.h"
|
| #include "bindings/core/v8/ScriptState.h"
|
| #include "bindings/core/v8/ScriptValue.h"
|
| @@ -33,6 +35,7 @@
|
| #include "bindings/core/v8/ScriptWrappableVisitor.h"
|
| #include "core/CoreExport.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"
|
| @@ -51,8 +54,6 @@
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| #include "wtf/CheckedNumeric.h"
|
| #include "wtf/text/WTFString.h"
|
| -#include <memory>
|
| -#include <set>
|
|
|
| namespace blink {
|
| class WebLayer;
|
| @@ -166,7 +167,9 @@ 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, DOMArrayBufferView* data, GLenum usage);
|
| + void bufferData(GLenum target,
|
| + NotShared<DOMArrayBufferView> data,
|
| + GLenum usage);
|
| void bufferSubData(GLenum target, long long offset, DOMArrayBuffer* data);
|
| void bufferSubData(GLenum target,
|
| long long offset,
|
| @@ -189,7 +192,7 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| GLsizei width,
|
| GLsizei height,
|
| GLint border,
|
| - DOMArrayBufferView* data);
|
| + NotShared<DOMArrayBufferView> data);
|
| void compressedTexSubImage2D(GLenum target,
|
| GLint level,
|
| GLint xoffset,
|
| @@ -197,7 +200,7 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| GLsizei width,
|
| GLsizei height,
|
| GLenum format,
|
| - DOMArrayBufferView* data);
|
| + NotShared<DOMArrayBufferView> data);
|
|
|
| void copyTexImage2D(GLenum target,
|
| GLint level,
|
| @@ -322,7 +325,7 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - DOMArrayBufferView* pixels);
|
| + NotShared<DOMArrayBufferView> pixels);
|
| void renderbufferStorage(GLenum target,
|
| GLenum internalformat,
|
| GLsizei width,
|
| @@ -345,7 +348,7 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| GLint border,
|
| GLenum format,
|
| GLenum type,
|
| - DOMArrayBufferView*);
|
| + NotShared<DOMArrayBufferView>);
|
| void texImage2D(GLenum target,
|
| GLint level,
|
| GLint internalformat,
|
| @@ -392,7 +395,7 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| GLsizei height,
|
| GLenum format,
|
| GLenum type,
|
| - DOMArrayBufferView*);
|
| + NotShared<DOMArrayBufferView>);
|
| void texSubImage2D(GLenum target,
|
| GLint level,
|
| GLint xoffset,
|
| @@ -467,19 +470,19 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| void uniform4iv(const WebGLUniformLocation*, Vector<GLint>&);
|
| void uniformMatrix2fv(const WebGLUniformLocation*,
|
| GLboolean transpose,
|
| - DOMFloat32Array* value);
|
| + NotShared<DOMFloat32Array> value);
|
| void uniformMatrix2fv(const WebGLUniformLocation*,
|
| GLboolean transpose,
|
| Vector<GLfloat>& value);
|
| void uniformMatrix3fv(const WebGLUniformLocation*,
|
| GLboolean transpose,
|
| - DOMFloat32Array* value);
|
| + NotShared<DOMFloat32Array> value);
|
| void uniformMatrix3fv(const WebGLUniformLocation*,
|
| GLboolean transpose,
|
| Vector<GLfloat>& value);
|
| void uniformMatrix4fv(const WebGLUniformLocation*,
|
| GLboolean transpose,
|
| - DOMFloat32Array* value);
|
| + NotShared<DOMFloat32Array> value);
|
| void uniformMatrix4fv(const WebGLUniformLocation*,
|
| GLboolean transpose,
|
| Vector<GLfloat>& value);
|
| @@ -488,16 +491,16 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
|
| void validateProgram(WebGLProgram*);
|
|
|
| void vertexAttrib1f(GLuint index, GLfloat x);
|
| - void vertexAttrib1fv(GLuint index, const DOMFloat32Array* values);
|
| + void vertexAttrib1fv(GLuint index, NotShared<const DOMFloat32Array> values);
|
| void vertexAttrib1fv(GLuint index, const Vector<GLfloat>& values);
|
| void vertexAttrib2f(GLuint index, GLfloat x, GLfloat y);
|
| - void vertexAttrib2fv(GLuint index, const DOMFloat32Array* values);
|
| + void vertexAttrib2fv(GLuint index, NotShared<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, const DOMFloat32Array* values);
|
| + void vertexAttrib3fv(GLuint index, NotShared<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, const DOMFloat32Array* values);
|
| + void vertexAttrib4fv(GLuint index, NotShared<const DOMFloat32Array> values);
|
| void vertexAttrib4fv(GLuint index, const Vector<GLfloat>& values);
|
| void vertexAttribPointer(GLuint index,
|
| GLint size,
|
|
|