Revert of Consolidate GPU buffer implementations

src/gpu/batches/GrVertexBatch.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrVertexBatch_DEFINED
 #define GrVertexBatch_DEFINED
 
@@ skipping 17 matching lines @@
 
 protected:
     /** Helper for rendering instances using an instanced index index buffer. This class creates the
         space for the vertices and flushes the draws to the batch target. */
    class InstancedHelper {
    public:
         InstancedHelper() {}
         /** Returns the allocated storage for the vertices. The caller should populate the before
             vertices before calling issueDraws(). */
         void* init(Target*, GrPrimitiveType, size_t vertexStride,
-                   const GrBuffer*, int verticesPerInstance, int indicesPerInstance,
+                   const GrIndexBuffer*, int verticesPerInstance, int indicesPerInstance,
                    int instancesToDraw);
 
         /** Call after init() to issue draws to the batch target.*/
         void recordDraw(Target* target);
     private:
         GrMesh  fMesh;
     };
 
     static const int kVerticesPerQuad = 4;
     static const int kIndicesPerQuad = 6;
@@ skipping 28 matching lines @@
 
     // Array of DrawArray. There may be inline uploads between each DrawArray and each DrawArray
     // may use a different primitive processor.
     typedef SkTLList<DrawArray, 4> DrawArrayList;
     DrawArrayList fDrawArrays;
 
     typedef GrDrawBatch INHERITED;
 };
 
 #endif