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

Unified Diff: Source/core/html/canvas/WebGL2RenderingContextBase.cpp

Issue 1157983002: Update WebGLVertexArrayObjectOES to WebGLVertexArrayObject for WebGL2 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix crash in testing conformance/context/context-lost-restored.html Created 5 years, 7 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: Source/core/html/canvas/WebGL2RenderingContextBase.cpp
diff --git a/Source/core/html/canvas/WebGL2RenderingContextBase.cpp b/Source/core/html/canvas/WebGL2RenderingContextBase.cpp
index 4e025b4acbe8da5f8e6ac892706f3ae99d8f4600..a7b0b3973d2f4d34ed3ab08f4e9e9127d4f7afed 100644
--- a/Source/core/html/canvas/WebGL2RenderingContextBase.cpp
+++ b/Source/core/html/canvas/WebGL2RenderingContextBase.cpp
@@ -21,7 +21,7 @@
#include "core/html/canvas/WebGLTexture.h"
#include "core/html/canvas/WebGLTransformFeedback.h"
#include "core/html/canvas/WebGLUniformLocation.h"
-#include "core/html/canvas/WebGLVertexArrayObjectOES.h"
+#include "core/html/canvas/WebGLVertexArrayObject.h"
#include "platform/NotImplemented.h"
@@ -1374,17 +1374,17 @@ void WebGL2RenderingContextBase::uniformBlockBinding(WebGLProgram* program, GLui
webContext()->uniformBlockBinding(objectOrZero(program), uniformBlockIndex, uniformBlockBinding);
}
-PassRefPtrWillBeRawPtr<WebGLVertexArrayObjectOES> WebGL2RenderingContextBase::createVertexArray()
+PassRefPtrWillBeRawPtr<WebGLVertexArrayObject> WebGL2RenderingContextBase::createVertexArray()
{
if (isContextLost())
return nullptr;
- RefPtrWillBeRawPtr<WebGLVertexArrayObjectOES> o = WebGLVertexArrayObjectOES::create(this, WebGLVertexArrayObjectOES::VaoTypeUser);
+ RefPtrWillBeRawPtr<WebGLVertexArrayObject> o = WebGLVertexArrayObject::create(this, WebGLVertexArrayObjectBase::VaoTypeUser);
addContextObject(o.get());
return o.release();
}
-void WebGL2RenderingContextBase::deleteVertexArray(WebGLVertexArrayObjectOES* vertexArray)
+void WebGL2RenderingContextBase::deleteVertexArray(WebGLVertexArrayObject* vertexArray)
{
if (isContextLost() || !vertexArray)
return;
@@ -1395,7 +1395,7 @@ void WebGL2RenderingContextBase::deleteVertexArray(WebGLVertexArrayObjectOES* ve
vertexArray->deleteObject(webContext());
}
-GLboolean WebGL2RenderingContextBase::isVertexArray(WebGLVertexArrayObjectOES* vertexArray)
+GLboolean WebGL2RenderingContextBase::isVertexArray(WebGLVertexArrayObject* vertexArray)
{
if (isContextLost() || !vertexArray)
return 0;
@@ -1406,7 +1406,7 @@ GLboolean WebGL2RenderingContextBase::isVertexArray(WebGLVertexArrayObjectOES* v
return webContext()->isVertexArrayOES(vertexArray->object());
}
-void WebGL2RenderingContextBase::bindVertexArray(WebGLVertexArrayObjectOES* vertexArray)
+void WebGL2RenderingContextBase::bindVertexArray(WebGLVertexArrayObject* vertexArray)
{
if (isContextLost())
return;

Powered by Google App Engine
This is Rietveld 408576698