Revert of Consolidate GPU buffer implementations

src/gpu/GrMesh.h

Index: src/gpu/GrMesh.h
diff --git a/src/gpu/GrMesh.h b/src/gpu/GrMesh.h
index 964e0b4a8e166d880ac5865a13f1556ebee6ff97..5ff23dcfd095c199d8444ca6a9602d8ad8532777 100644
--- a/src/gpu/GrMesh.h
+++ b/src/gpu/GrMesh.h
@@ -8,8 +8,8 @@
 #ifndef GrMesh_DEFINED
 #define GrMesh_DEFINED
 
-#include "GrBuffer.h"
-#include "GrGpuResourceRef.h"
+#include "GrIndexBuffer.h"
+#include "GrVertexBuffer.h"
 
 class GrNonInstancedMesh {
 public:
@@ -20,8 +20,8 @@
     int indexCount() const { return fIndexCount; }
     bool isIndexed() const { return fIndexCount > 0; }
 
-    const GrBuffer* vertexBuffer() const { return fVertexBuffer.get(); }
-    const GrBuffer* indexBuffer() const { return fIndexBuffer.get(); }
+    const GrVertexBuffer* vertexBuffer() const { return fVertexBuffer.get(); }
+    const GrIndexBuffer* indexBuffer() const { return fIndexBuffer.get(); }
 
 protected:
     GrPrimitiveType         fPrimitiveType;
@@ -29,8 +29,8 @@
     int                     fStartIndex;
     int                     fVertexCount;
     int                     fIndexCount;
-    GrPendingIOResource<const GrBuffer, kRead_GrIOType> fVertexBuffer;
-    GrPendingIOResource<const GrBuffer, kRead_GrIOType> fIndexBuffer;
+    GrPendingIOResource<const GrVertexBuffer, kRead_GrIOType> fVertexBuffer;
+    GrPendingIOResource<const GrIndexBuffer, kRead_GrIOType>  fIndexBuffer;
     friend class GrMesh;
 };
 
@@ -46,7 +46,7 @@
     GrMesh(const GrMesh& di) { (*this) = di; }
     GrMesh& operator =(const GrMesh& di);
 
-    void init(GrPrimitiveType primType, const GrBuffer* vertexBuffer, int startVertex,
+    void init(GrPrimitiveType primType, const GrVertexBuffer* vertexBuffer, int startVertex,
                 int vertexCount) {
         SkASSERT(vertexBuffer);
         SkASSERT(vertexCount);
@@ -65,8 +65,8 @@
     }
 
     void initIndexed(GrPrimitiveType primType,
-                        const GrBuffer* vertexBuffer,
-                        const GrBuffer* indexBuffer,
+                        const GrVertexBuffer* vertexBuffer,
+                        const GrIndexBuffer* indexBuffer,
                         int startVertex,
                         int startIndex,
                         int vertexCount,
@@ -95,8 +95,8 @@
         the number of instances supported by the index buffer. To be used with
         nextInstances() to draw in max-sized batches.*/
     void initInstanced(GrPrimitiveType primType,
-                        const GrBuffer* vertexBuffer,
-                        const GrBuffer* indexBuffer,
+                        const GrVertexBuffer* vertexBuffer,
+                        const GrIndexBuffer* indexBuffer,
                         int startVertex,
                         int verticesPerInstance,
                         int indicesPerInstance,