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 a61945b395180d74c4dc6affa4eb517e294514eb..6c50ce8d2c02bcd28a97e31d44e1ddc42ec71334 100644 |
--- a/third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp |
+++ b/third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp |
@@ -64,14 +64,14 @@ WebGLVertexArrayObjectOES* OESVertexArrayObject::createVertexArrayOES() |
return o; |
} |
-void OESVertexArrayObject::deleteVertexArrayOES(WebGLVertexArrayObjectOES* arrayObject) |
+void OESVertexArrayObject::deleteVertexArrayOES(ScriptState* scriptState, WebGLVertexArrayObjectOES* arrayObject) |
{ |
WebGLExtensionScopedContext scoped(this); |
if (!arrayObject || scoped.isLost()) |
return; |
if (!arrayObject->isDefaultObject() && arrayObject == scoped.context()->m_boundVertexArrayObject) |
- scoped.context()->setBoundVertexArrayObject(nullptr); |
+ scoped.context()->setBoundVertexArrayObject(scriptState, nullptr); |
arrayObject->deleteObject(scoped.context()->webContext()); |
} |
@@ -88,7 +88,7 @@ GLboolean OESVertexArrayObject::isVertexArrayOES(WebGLVertexArrayObjectOES* arra |
return scoped.context()->webContext()->isVertexArrayOES(arrayObject->object()); |
} |
-void OESVertexArrayObject::bindVertexArrayOES(WebGLVertexArrayObjectOES* arrayObject) |
+void OESVertexArrayObject::bindVertexArrayOES(ScriptState* scriptState, WebGLVertexArrayObjectOES* arrayObject) |
{ |
WebGLExtensionScopedContext scoped(this); |
if (scoped.isLost()) |
@@ -103,10 +103,10 @@ void OESVertexArrayObject::bindVertexArrayOES(WebGLVertexArrayObjectOES* arrayOb |
scoped.context()->webContext()->bindVertexArrayOES(arrayObject->object()); |
arrayObject->setHasEverBeenBound(); |
- scoped.context()->setBoundVertexArrayObject(arrayObject); |
+ scoped.context()->setBoundVertexArrayObject(scriptState, arrayObject); |
} else { |
scoped.context()->webContext()->bindVertexArrayOES(0); |
- scoped.context()->setBoundVertexArrayObject(nullptr); |
+ scoped.context()->setBoundVertexArrayObject(scriptState, nullptr); |
} |
} |