Remove GrGLVertexArray from GrGpuResource hierarchy.

src/gpu/gl/GrGLVertexArray.h

Index: src/gpu/gl/GrGLVertexArray.h
diff --git a/src/gpu/gl/GrGLVertexArray.h b/src/gpu/gl/GrGLVertexArray.h
index 77f4fd0eecea1401c5e633d2d6ef608bc9d485dd..ce0762dd2ff118f92a654537a4652597e7045da9 100644
--- a/src/gpu/gl/GrGLVertexArray.h
+++ b/src/gpu/gl/GrGLVertexArray.h
@@ -8,13 +8,11 @@
 #ifndef GrGLVertexArray_DEFINED
 #define GrGLVertexArray_DEFINED
 
-#include "GrGpuResource.h"
+#include "SkTArray.h"

[joshualitt, 2015/05/12 13:58:14]

Nit, but don't we usually put these in alphabetical-esque order? 

[bsalomon, 2015/05/14 19:49:18]

Done.

 #include "GrTypesPriv.h"
 #include "gl/GrGLDefines.h"
 #include "gl/GrGLFunctions.h"
 
-#include "SkTArray.h"
-
 class GrGLVertexBuffer;
 class GrGLIndexBuffer;
 class GrGLGpu;
@@ -134,22 +132,22 @@ private:
  * This class represents an OpenGL vertex array object. It manages the lifetime of the vertex array
  * and is used to track the state of the vertex array to avoid redundant GL calls.
  */
-class GrGLVertexArray : public GrGpuResource {
+class GrGLVertexArray {
 public:
-    GrGLVertexArray(GrGLGpu* gpu, GrGLint id, int attribCount);
+    GrGLVertexArray(GrGLint id, int attribCount);
 
     /**
      * Binds this vertex array. If the ID has been deleted or abandoned then NULL is returned.
      * Otherwise, the GrGLAttribArrayState that is tracking this vertex array's attrib bindings is
      * returned.
      */
-    GrGLAttribArrayState* bind();
+    GrGLAttribArrayState* bind(GrGLGpu*);
 
     /**
      * This is a version of the above function that also binds an index buffer to the vertex
      * array object.
      */
-    GrGLAttribArrayState* bindWithIndexBuffer(const GrGLIndexBuffer* indexBuffer);
+    GrGLAttribArrayState* bindWithIndexBuffer(GrGLGpu* gpu, const GrGLIndexBuffer*);
 
     void notifyIndexBufferDelete(GrGLuint bufferID);
 
@@ -161,20 +159,11 @@ public:
 
     void invalidateCachedState();
 
-protected:
-    size_t onGpuMemorySize() const override { return 0; }
-
-    void onAbandon() override;
-
-    void onRelease() override;
-
 private:
     GrGLuint                fID;
     GrGLAttribArrayState    fAttribArrays;
     GrGLuint                fIndexBufferID;
     bool                    fIndexBufferIDIsValid;
-
-    typedef GrGpuResource INHERITED;
 };
 
 #endif