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

Unified Diff: third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp

Issue 1815803003: Move simple methods [T-Z] from WebGraphicsContext3D to GLES2Interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simples-fplus
Patch Set: simples-tplus: fixed Created 4 years, 9 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/OESVertexArrayObject.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp b/third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp
index 7bb914f8693fdeb60080b5d03715aa4ce38a445a..db251f3a6df0a3d931bbc49f9e17247956645351 100644
--- a/third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp
+++ b/third_party/WebKit/Source/modules/webgl/OESVertexArrayObject.cpp
@@ -26,6 +26,7 @@
#include "modules/webgl/OESVertexArrayObject.h"
#include "bindings/core/v8/ExceptionState.h"
+#include "gpu/command_buffer/client/gles2_interface.h"
#include "modules/webgl/WebGLRenderingContextBase.h"
#include "modules/webgl/WebGLVertexArrayObjectOES.h"
@@ -71,7 +72,7 @@ void OESVertexArrayObject::deleteVertexArrayOES(ScriptState* scriptState, WebGLV
if (!arrayObject->isDefaultObject() && arrayObject == scoped.context()->m_boundVertexArrayObject)
scoped.context()->setBoundVertexArrayObject(scriptState, nullptr);
- arrayObject->deleteObject(scoped.context()->webContext());
+ arrayObject->deleteObject(scoped.context()->webContext(), scoped.context()->contextGL());
}
GLboolean OESVertexArrayObject::isVertexArrayOES(WebGLVertexArrayObjectOES* arrayObject)
@@ -83,7 +84,7 @@ GLboolean OESVertexArrayObject::isVertexArrayOES(WebGLVertexArrayObjectOES* arra
if (!arrayObject->hasEverBeenBound())
return 0;
- return scoped.context()->webContext()->isVertexArrayOES(arrayObject->object());
+ return scoped.context()->contextGL()->IsVertexArrayOES(arrayObject->object());
}
void OESVertexArrayObject::bindVertexArrayOES(ScriptState* scriptState, WebGLVertexArrayObjectOES* arrayObject)
@@ -98,12 +99,12 @@ void OESVertexArrayObject::bindVertexArrayOES(ScriptState* scriptState, WebGLVer
}
if (arrayObject && !arrayObject->isDefaultObject() && arrayObject->object()) {
- scoped.context()->webContext()->bindVertexArrayOES(arrayObject->object());
+ scoped.context()->contextGL()->BindVertexArrayOES(arrayObject->object());
arrayObject->setHasEverBeenBound();
scoped.context()->setBoundVertexArrayObject(scriptState, arrayObject);
} else {
- scoped.context()->webContext()->bindVertexArrayOES(0);
+ scoped.context()->contextGL()->BindVertexArrayOES(0);
scoped.context()->setBoundVertexArrayObject(scriptState, nullptr);
}
}

Powered by Google App Engine
This is Rietveld 408576698