Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(586)

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h

Issue 2812833003: Revert of [SharedArrayBuffer] Prevent SharedArrayBuffer being used in Web APIs (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
index 52b1d744fb4b64770228ef80a9e6ba8c0074740a..086ede6a51cd68ec8ee054952cd1d5bd6f2f2076 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
+++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h
@@ -31,35 +31,21 @@
void DestroyContext() override;
/* Buffer objects */
- void bufferData(GLenum,
- NotShared<DOMArrayBufferView>,
- GLenum,
- GLuint,
- GLuint);
- void bufferSubData(GLenum,
- GLintptr,
- NotShared<DOMArrayBufferView>,
- GLuint,
- GLuint);
+ void bufferData(GLenum, DOMArrayBufferView*, GLenum, GLuint, GLuint);
+ void bufferSubData(GLenum, GLintptr, DOMArrayBufferView*, GLuint, GLuint);
// Have to re-declare/re-define the following buffer{Sub}Data functions from
// base class. This is because the above buffer{Sub}Data() hides the name
// from base class.
void bufferData(GLenum target, long long size, GLenum usage);
void bufferData(GLenum target, DOMArrayBuffer* data, GLenum usage);
- void bufferData(GLenum target,
- NotShared<DOMArrayBufferView> data,
- GLenum usage);
+ void bufferData(GLenum target, DOMArrayBufferView* data, GLenum usage);
void bufferSubData(GLenum target, long long offset, DOMArrayBuffer* data);
void bufferSubData(GLenum target,
long long offset,
const FlexibleArrayBufferView& data);
void copyBufferSubData(GLenum, GLenum, long long, long long, long long);
- void getBufferSubData(GLenum,
- long long,
- NotShared<DOMArrayBufferView>,
- GLuint,
- GLuint);
+ void getBufferSubData(GLenum, long long, DOMArrayBufferView*, GLuint, GLuint);
void RegisterGetBufferSubDataAsyncCallback(
WebGLGetBufferSubDataAsyncCallback*);
@@ -163,7 +149,7 @@
GLint,
GLenum,
GLenum,
- NotShared<DOMArrayBufferView>,
+ DOMArrayBufferView*,
GLuint);
void texSubImage2D(GLenum,
@@ -232,7 +218,7 @@
GLsizei,
GLenum,
GLenum,
- NotShared<DOMArrayBufferView>,
+ DOMArrayBufferView*,
GLuint);
// Have to re-declare/re-define the following tex{Sub}Image2D functions from
@@ -312,7 +298,7 @@
GLint,
GLenum,
GLenum,
- NotShared<DOMArrayBufferView>);
+ DOMArrayBufferView*);
void texImage3D(GLenum,
GLint,
GLint,
@@ -322,7 +308,7 @@
GLint,
GLenum,
GLenum,
- NotShared<DOMArrayBufferView>,
+ DOMArrayBufferView*,
GLuint);
void texImage3D(GLenum,
GLint,
@@ -398,7 +384,7 @@
GLsizei,
GLenum,
GLenum,
- NotShared<DOMArrayBufferView>,
+ DOMArrayBufferView*,
GLuint);
void texSubImage3D(GLenum,
GLint,
@@ -479,7 +465,7 @@
GLint,
GLenum,
GLenum,
- NotShared<DOMArrayBufferView>);
+ DOMArrayBufferView*);
void texSubImage2D(GLenum,
GLint,
GLint,
@@ -488,7 +474,7 @@
GLsizei,
GLenum,
GLenum,
- NotShared<DOMArrayBufferView>);
+ DOMArrayBufferView*);
void copyTexSubImage3D(GLenum,
GLint,
@@ -506,7 +492,7 @@
GLsizei width,
GLsizei height,
GLint border,
- NotShared<DOMArrayBufferView> data,
+ DOMArrayBufferView* data,
GLuint src_offset,
GLuint src_length_override);
void compressedTexSubImage2D(GLenum target,
@@ -516,7 +502,7 @@
GLsizei width,
GLsizei height,
GLenum format,
- NotShared<DOMArrayBufferView> data,
+ DOMArrayBufferView* data,
GLuint src_offset,
GLuint src_length_override);
void compressedTexImage3D(GLenum,
@@ -526,7 +512,7 @@
GLsizei,
GLsizei,
GLint,
- NotShared<DOMArrayBufferView>,
+ DOMArrayBufferView*,
GLuint,
GLuint);
void compressedTexSubImage3D(GLenum,
@@ -538,7 +524,7 @@
GLsizei,
GLsizei,
GLenum,
- NotShared<DOMArrayBufferView>,
+ DOMArrayBufferView*,
GLuint,
GLuint);
void compressedTexImage2D(GLenum target,
@@ -588,7 +574,7 @@
GLsizei width,
GLsizei height,
GLint border,
- NotShared<DOMArrayBufferView> data);
+ DOMArrayBufferView* data);
void compressedTexSubImage2D(GLenum target,
GLint level,
GLint xoffset,
@@ -596,7 +582,7 @@
GLsizei width,
GLsizei height,
GLenum format,
- NotShared<DOMArrayBufferView> data);
+ DOMArrayBufferView* data);
/* Programs and shaders */
GLint getFragDataLocation(WebGLProgram*, const String&);
@@ -692,7 +678,7 @@
GLuint);
void uniformMatrix2fv(const WebGLUniformLocation*,
GLboolean,
- NotShared<DOMFloat32Array>,
+ DOMFloat32Array*,
GLuint,
GLuint);
void uniformMatrix2fv(const WebGLUniformLocation*,
@@ -702,7 +688,7 @@
GLuint);
void uniformMatrix3fv(const WebGLUniformLocation*,
GLboolean,
- NotShared<DOMFloat32Array>,
+ DOMFloat32Array*,
GLuint,
GLuint);
void uniformMatrix3fv(const WebGLUniformLocation*,
@@ -712,7 +698,7 @@
GLuint);
void uniformMatrix4fv(const WebGLUniformLocation*,
GLboolean,
- NotShared<DOMFloat32Array>,
+ DOMFloat32Array*,
GLuint,
GLuint);
void uniformMatrix4fv(const WebGLUniformLocation*,
@@ -722,7 +708,7 @@
GLuint);
void uniformMatrix2x3fv(const WebGLUniformLocation*,
GLboolean,
- NotShared<DOMFloat32Array>,
+ DOMFloat32Array*,
GLuint,
GLuint);
void uniformMatrix2x3fv(const WebGLUniformLocation*,
@@ -732,7 +718,7 @@
GLuint);
void uniformMatrix3x2fv(const WebGLUniformLocation*,
GLboolean,
- NotShared<DOMFloat32Array>,
+ DOMFloat32Array*,
GLuint,
GLuint);
void uniformMatrix3x2fv(const WebGLUniformLocation*,
@@ -742,7 +728,7 @@
GLuint);
void uniformMatrix2x4fv(const WebGLUniformLocation*,
GLboolean,
- NotShared<DOMFloat32Array>,
+ DOMFloat32Array*,
GLuint,
GLuint);
void uniformMatrix2x4fv(const WebGLUniformLocation*,
@@ -752,7 +738,7 @@
GLuint);
void uniformMatrix4x2fv(const WebGLUniformLocation*,
GLboolean,
- NotShared<DOMFloat32Array>,
+ DOMFloat32Array*,
GLuint,
GLuint);
void uniformMatrix4x2fv(const WebGLUniformLocation*,
@@ -762,7 +748,7 @@
GLuint);
void uniformMatrix3x4fv(const WebGLUniformLocation*,
GLboolean,
- NotShared<DOMFloat32Array>,
+ DOMFloat32Array*,
GLuint,
GLuint);
void uniformMatrix3x4fv(const WebGLUniformLocation*,
@@ -772,7 +758,7 @@
GLuint);
void uniformMatrix4x3fv(const WebGLUniformLocation*,
GLboolean,
- NotShared<DOMFloat32Array>,
+ DOMFloat32Array*,
GLuint,
GLuint);
void uniformMatrix4x3fv(const WebGLUniformLocation*,
@@ -801,28 +787,28 @@
void uniform4iv(const WebGLUniformLocation*, Vector<GLint>&);
void uniformMatrix2fv(const WebGLUniformLocation*,
GLboolean transpose,
- NotShared<DOMFloat32Array> value);
+ DOMFloat32Array* value);
void uniformMatrix2fv(const WebGLUniformLocation*,
GLboolean transpose,
Vector<GLfloat>& value);
void uniformMatrix3fv(const WebGLUniformLocation*,
GLboolean transpose,
- NotShared<DOMFloat32Array> value);
+ DOMFloat32Array* value);
void uniformMatrix3fv(const WebGLUniformLocation*,
GLboolean transpose,
Vector<GLfloat>& value);
void uniformMatrix4fv(const WebGLUniformLocation*,
GLboolean transpose,
- NotShared<DOMFloat32Array> value);
+ DOMFloat32Array* value);
void uniformMatrix4fv(const WebGLUniformLocation*,
GLboolean transpose,
Vector<GLfloat>& value);
void vertexAttribI4i(GLuint, GLint, GLint, GLint, GLint);
- void vertexAttribI4iv(GLuint, NotShared<const DOMInt32Array>);
+ void vertexAttribI4iv(GLuint, const DOMInt32Array*);
void vertexAttribI4iv(GLuint, const Vector<GLint>&);
void vertexAttribI4ui(GLuint, GLuint, GLuint, GLuint, GLuint);
- void vertexAttribI4uiv(GLuint, NotShared<const DOMUint32Array>);
+ void vertexAttribI4uiv(GLuint, const DOMUint32Array*);
void vertexAttribI4uiv(GLuint, const Vector<GLuint>&);
void vertexAttribIPointer(GLuint index,
GLint size,
@@ -843,11 +829,11 @@
/* Multiple Render Targets */
void drawBuffers(const Vector<GLenum>&);
- void clearBufferiv(GLenum, GLint, NotShared<DOMInt32Array>);
+ void clearBufferiv(GLenum, GLint, DOMInt32Array*);
void clearBufferiv(GLenum, GLint, const Vector<GLint>&);
- void clearBufferuiv(GLenum, GLint, NotShared<DOMUint32Array>);
+ void clearBufferuiv(GLenum, GLint, DOMUint32Array*);
void clearBufferuiv(GLenum, GLint, const Vector<GLuint>&);
- void clearBufferfv(GLenum, GLint, NotShared<DOMFloat32Array>);
+ void clearBufferfv(GLenum, GLint, DOMFloat32Array*);
void clearBufferfv(GLenum, GLint, const Vector<GLfloat>&);
void clearBufferfi(GLenum, GLint, GLfloat, GLint);
@@ -922,7 +908,7 @@
GLsizei height,
GLenum format,
GLenum type,
- NotShared<DOMArrayBufferView> pixels,
+ DOMArrayBufferView* pixels,
GLuint offset);
void readPixels(GLint x,
GLint y,
@@ -951,7 +937,7 @@
GLsizei height,
GLenum format,
GLenum type,
- NotShared<DOMArrayBufferView> pixels) override;
+ DOMArrayBufferView* pixels) override;
void RestoreCurrentFramebuffer() override;
DECLARE_VIRTUAL_TRACE();

Powered by Google App Engine
This is Rietveld 408576698