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

Unified Diff: Source/core/html/canvas/WebGLRenderingContextBase.h

Issue 1157983002: Update WebGLVertexArrayObjectOES to WebGLVertexArrayObject for WebGL2 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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/WebGLRenderingContextBase.h
diff --git a/Source/core/html/canvas/WebGLRenderingContextBase.h b/Source/core/html/canvas/WebGLRenderingContextBase.h
index 66f4187b4f059c5b02e20c26e7df8dbc047c269d..4b48e754a8247edd7816c2435974959edd14e4bf 100644
--- a/Source/core/html/canvas/WebGLRenderingContextBase.h
+++ b/Source/core/html/canvas/WebGLRenderingContextBase.h
@@ -36,7 +36,7 @@
#include "core/html/canvas/WebGLContextAttributes.h"
#include "core/html/canvas/WebGLExtensionName.h"
#include "core/html/canvas/WebGLTexture.h"
-#include "core/html/canvas/WebGLVertexArrayObjectOES.h"
+#include "core/html/canvas/WebGLVertexArrayObjectImpl.h"
#include "core/layout/LayoutBoxModelObject.h"
#include "core/page/Page.h"
#include "platform/Timer.h"
@@ -99,7 +99,7 @@ class WebGLShaderPrecisionFormat;
class WebGLSharedObject;
class WebGLSharedWebGraphicsContext3D;
class WebGLUniformLocation;
-class WebGLVertexArrayObjectOES;
+class WebGLVertexArrayObjectImpl;
class WebGLRenderingContextLostCallback;
class WebGLRenderingContextErrorMessageCallback;
@@ -405,7 +405,7 @@ protected:
friend class WebGLCompressedTexturePVRTC;
friend class WebGLCompressedTextureS3TC;
friend class WebGLRenderingContextErrorMessageCallback;
- friend class WebGLVertexArrayObjectOES;
+ friend class WebGLVertexArrayObjectImpl;
friend class ScopedTexture2DRestorer;
friend class ScopedFramebufferRestorer;
@@ -487,9 +487,9 @@ protected:
// List of bound VBO's. Used to maintain info about sizes for ARRAY_BUFFER and stored values for ELEMENT_ARRAY_BUFFER
RefPtrWillBeMember<WebGLBuffer> m_boundArrayBuffer;
- RefPtrWillBeMember<WebGLVertexArrayObjectOES> m_defaultVertexArrayObject;
- RefPtrWillBeMember<WebGLVertexArrayObjectOES> m_boundVertexArrayObject;
- void setBoundVertexArrayObject(PassRefPtrWillBeRawPtr<WebGLVertexArrayObjectOES> arrayObject)
+ RefPtrWillBeMember<WebGLVertexArrayObjectImpl> m_defaultVertexArrayObject;
+ RefPtrWillBeMember<WebGLVertexArrayObjectImpl> m_boundVertexArrayObject;
+ void setBoundVertexArrayObject(PassRefPtrWillBeRawPtr<WebGLVertexArrayObjectImpl> arrayObject)
{
if (arrayObject)
m_boundVertexArrayObject = arrayObject;

Powered by Google App Engine
This is Rietveld 408576698