Split GrResource into GrCacheable/GrGpuObject

src/gpu/gl/GrGLVertexArray.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLVertexArray_DEFINED
 #define GrGLVertexArray_DEFINED
 
-#include "GrResource.h"
+#include "GrGpuObject.h"
 #include "GrTypesPriv.h"
 #include "gl/GrGLDefines.h"
 #include "gl/GrGLFunctions.h"
 
 #include "SkTArray.h"
 
 class GrGLVertexBuffer;
 class GrGLIndexBuffer;
 class GrGpuGL;
 
@@ skipping 101 matching lines @@
             GrGLvoid*   fOffset;
     };
 
     SkSTArray<16, AttribArrayState, true> fAttribArrayStates;
 };
 
 /**
  * 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 GrResource {
+class GrGLVertexArray : public GrGpuObject {
 public:
     GrGLVertexArray(GrGpuGL* gpu, 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();
 
     /**
      * This is a version of the above function that also binds an index buffer to the vertex
      * array object.
      */
     GrGLAttribArrayState* bindWithIndexBuffer(const GrGLIndexBuffer* indexBuffer);
 
     void notifyIndexBufferDelete(GrGLuint bufferID);
 
     void notifyVertexBufferDelete(GrGLuint id) {
         fAttribArrays.notifyVertexBufferDelete(id);
     }
 
     GrGLuint arrayID() const { return fID; }
 
     void invalidateCachedState();
 
-    virtual size_t sizeInBytes() const SK_OVERRIDE { return 0; }
+    virtual size_t gpuMemorySize() const SK_OVERRIDE { return 0; }
 
 protected:
     virtual void onAbandon() SK_OVERRIDE;
 
     virtual void onRelease() SK_OVERRIDE;
 
 private:
     GrGLuint                fID;
     GrGLAttribArrayState    fAttribArrays;
     GrGLuint                fIndexBufferID;
     bool                    fIndexBufferIDIsValid;
 
-    typedef GrResource INHERITED;
+    typedef GrGpuObject INHERITED;
 };
 
 #endif