third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h - Issue 2812833003: Revert of [SharedArrayBuffer] Prevent SharedArrayBuffer being used in Web APIs

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.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

« no previous file with comments | « third_party/WebKit/Source/modules/webgl/WebGLGetBufferSubDataAsync.cpp ('k') | third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 5c34932d828914cbcd5c56e1522f71653a22cbcf..45a8a20a36bce701e1a0db1a4ff7b1dca3225600 100644

--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h

+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h

@@ -26,8 +26,6 @@

#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"

@@ -35,7 +33,6 @@

#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"

@@ -54,6 +51,8 @@

#include "third_party/khronos/GLES2/gl2.h"

#include "wtf/CheckedNumeric.h"

#include "wtf/text/WTFString.h"

+#include <memory>

+#include <set>

namespace blink {

class WebLayer;

@@ -167,9 +166,7 @@

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,

@@ -192,7 +189,7 @@

GLsizei width,

GLsizei height,

GLint border,

- NotShared<DOMArrayBufferView> data);

+ DOMArrayBufferView* data);

void compressedTexSubImage2D(GLenum target,

GLint level,

GLint xoffset,

@@ -200,7 +197,7 @@

GLsizei width,

GLsizei height,

GLenum format,

- NotShared<DOMArrayBufferView> data);

+ DOMArrayBufferView* data);

void copyTexImage2D(GLenum target,

GLint level,

@@ -325,7 +322,7 @@

GLsizei height,

GLenum format,

GLenum type,

- NotShared<DOMArrayBufferView> pixels);

+ DOMArrayBufferView* pixels);

void renderbufferStorage(GLenum target,

GLenum internalformat,

GLsizei width,

@@ -348,7 +345,7 @@

GLint border,

GLenum format,

GLenum type,

- NotShared<DOMArrayBufferView>);

+ DOMArrayBufferView*);

void texImage2D(GLenum target,

GLint level,

GLint internalformat,

@@ -395,7 +392,7 @@

GLsizei height,

GLenum format,

GLenum type,

- NotShared<DOMArrayBufferView>);

+ DOMArrayBufferView*);

void texSubImage2D(GLenum target,

GLint level,

GLint xoffset,

@@ -470,19 +467,19 @@

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);

@@ -491,16 +488,16 @@

void validateProgram(WebGLProgram*);

void vertexAttrib1f(GLuint index, GLfloat x);

- void vertexAttrib1fv(GLuint index, NotShared<const DOMFloat32Array> values);

+ void vertexAttrib1fv(GLuint index, 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, 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, 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, const DOMFloat32Array* values);

void vertexAttrib4fv(GLuint index, const Vector<GLfloat>& values);

void vertexAttribPointer(GLuint index,

GLint size,