third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp - Issue 2273683003: Use visitDOMWrapper to preserve WebGL JS object wrappers

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/OESVertexArrayObject.cpp

Issue 2273683003: Use visitDOMWrapper to preserve WebGL JS object wrappers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: style Created 4 years, 3 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

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

Index: third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp

diff --git a/third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp b/third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp

index 74c640508dc48c97c0d24546b91c5be80e12d3dd..cae93162b342013de36956d65bb6b35289a7fae0 100644

--- a/third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp

+++ b/third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp

@@ -63,14 +63,14 @@ WebGLVertexArrayObjectOES* OESVertexArrayObject::createVertexArrayOES()

return o;

}

-void OESVertexArrayObject::deleteVertexArrayOES(ScriptState* scriptState, WebGLVertexArrayObjectOES* arrayObject)

+void OESVertexArrayObject::deleteVertexArrayOES(WebGLVertexArrayObjectOES* arrayObject)

{

WebGLExtensionScopedContext scoped(this);

if (!arrayObject || scoped.isLost())

return;

if (!arrayObject->isDefaultObject() && arrayObject == scoped.context()->m_boundVertexArrayObject)

- scoped.context()->setBoundVertexArrayObject(scriptState, nullptr);

+ scoped.context()->setBoundVertexArrayObject(nullptr);

arrayObject->deleteObject(scoped.context()->contextGL());

}

@@ -87,7 +87,7 @@ GLboolean OESVertexArrayObject::isVertexArrayOES(WebGLVertexArrayObjectOES* arra

return scoped.context()->contextGL()->IsVertexArrayOES(arrayObject->object());

}

-void OESVertexArrayObject::bindVertexArrayOES(ScriptState* scriptState, WebGLVertexArrayObjectOES* arrayObject)

+void OESVertexArrayObject::bindVertexArrayOES(WebGLVertexArrayObjectOES* arrayObject)

{

WebGLExtensionScopedContext scoped(this);

if (scoped.isLost())

@@ -102,10 +102,10 @@ void OESVertexArrayObject::bindVertexArrayOES(ScriptState* scriptState, WebGLVer

scoped.context()->contextGL()->BindVertexArrayOES(arrayObject->object());

arrayObject->setHasEverBeenBound();

- scoped.context()->setBoundVertexArrayObject(scriptState, arrayObject);

+ scoped.context()->setBoundVertexArrayObject(arrayObject);

} else {

scoped.context()->contextGL()->BindVertexArrayOES(0);

- scoped.context()->setBoundVertexArrayObject(scriptState, nullptr);

+ scoped.context()->setBoundVertexArrayObject(nullptr);

}