Revert of Consolidate GPU buffer implementations

src/gpu/batches/GrDrawVerticesBatch.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDrawVerticesBatch.h"
 
 #include "GrBatchFlushState.h"
@@ skipping 88 matching lines @@
                               fCoverageIgnored));
     target->initDraw(gp);
 
     size_t vertexStride = gp->getVertexStride();
 
     SkASSERT(vertexStride == sizeof(SkPoint) + (hasLocalCoords ? sizeof(SkPoint) : 0)
                                              + sizeof(GrColor));
 
     int instanceCount = fGeoData.count();
 
-    const GrBuffer* vertexBuffer;
+    const GrVertexBuffer* vertexBuffer;
     int firstVertex;
 
     void* verts = target->makeVertexSpace(vertexStride, fVertexCount, &vertexBuffer, &firstVertex);
 
     if (!verts) {
         SkDebugf("Could not allocate vertices\n");
         return;
     }
 
-    const GrBuffer* indexBuffer = nullptr;
+    const GrIndexBuffer* indexBuffer = nullptr;
     int firstIndex = 0;
 
     uint16_t* indices = nullptr;
     if (!fGeoData[0].fIndices.isEmpty()) {
         indices = target->makeIndexSpace(fIndexCount, &indexBuffer, &firstIndex);
 
         if (!indices) {
             SkDebugf("Could not allocate indices\n");
             return;
         }
@@ skipping 187 matching lines @@
     geometry.fColor = GrRandomColor(random);
     return GrDrawVerticesBatch::Create(geometry, type, viewMatrix,
                                        positions.begin(), vertexCount,
                                        indices.begin(), hasIndices ? vertexCount : 0,
                                        colors.begin(),
                                        texCoords.begin(),
                                        bounds);
 }
 
 #endif