third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h - Issue 1387743002: Fixed expando-loss.html test.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1387743002: Fixed expando-loss.html test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cache ScriptState and use it to wrap m_defaultVertexArrayObject. Created 5 years, 2 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

« third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DAPITest.cpp ('K') | « third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.cpp ('k') | third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp » ('j') | third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e9ae9ea423ad15664691a1647f7fb3209f171564..c47b01755ac03270f1e3c3937b0de1e5243ccb47 100644

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

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

@@ -160,16 +160,16 @@ public:

/* Vertex Array Objects */

WebGLVertexArrayObject* createVertexArray();

- void deleteVertexArray(WebGLVertexArrayObject*);

+ void deleteVertexArray(ScriptState*, WebGLVertexArrayObject*);

GLboolean isVertexArray(WebGLVertexArrayObject*);

- void bindVertexArray(WebGLVertexArrayObject*);

+ void bindVertexArray(ScriptState*, WebGLVertexArrayObject*);

/* Reading */

void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, long long offset);

/* WebGLRenderingContextBase overrides */

void initializeNewContext() override;

- void bindFramebuffer(GLenum target, WebGLFramebuffer*) override;

+ void bindFramebuffer(ScriptState*, GLenum target, WebGLFramebuffer*) override;

void deleteFramebuffer(WebGLFramebuffer*) override;

ScriptValue getParameter(ScriptState*, GLenum pname) override;

ScriptValue getTexParameter(ScriptState*, GLenum target, GLenum pname) override;

@@ -181,7 +181,7 @@ public:

DECLARE_VIRTUAL_TRACE();

protected:

- WebGL2RenderingContextBase(HTMLCanvasElement*, PassOwnPtr<WebGraphicsContext3D>, const WebGLContextAttributes& requestedAttributes);

+ WebGL2RenderingContextBase(HTMLCanvasElement*, ScriptState*, PassOwnPtr<WebGraphicsContext3D>, const WebGLContextAttributes& requestedAttributes);

// Helper function to validate target and the attachment combination for getFramebufferAttachmentParameters.

// Generate GL error and return false if parameters are illegal.