Revert of Consolidate GPU buffer implementations

src/gpu/batches/GrAAConvexPathRenderer.cpp

Index: src/gpu/batches/GrAAConvexPathRenderer.cpp
diff --git a/src/gpu/batches/GrAAConvexPathRenderer.cpp b/src/gpu/batches/GrAAConvexPathRenderer.cpp
index ba19a0db85394a40095f5af516a483d2ff6c5d86..f6be36669799a5e5908db001a503a50e3742a44d 100644
--- a/src/gpu/batches/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/batches/GrAAConvexPathRenderer.cpp
@@ -814,7 +814,7 @@
                 continue;
             }
 
-            const GrBuffer* vertexBuffer;
+            const GrVertexBuffer* vertexBuffer;
             int firstVertex;
 
             void* verts = target->makeVertexSpace(vertexStride, tess.numPts(), &vertexBuffer,
@@ -824,7 +824,7 @@
                 return;
             }
 
-            const GrBuffer* indexBuffer;
+            const GrIndexBuffer* indexBuffer;
             int firstIndex;
 
             uint16_t* idxs = target->makeIndexSpace(tess.numIndices(), &indexBuffer, &firstIndex);
@@ -900,7 +900,7 @@
                 continue;
             }
 
-            const GrBuffer* vertexBuffer;
+            const GrVertexBuffer* vertexBuffer;
             int firstVertex;
 
             size_t vertexStride = quadProcessor->getVertexStride();
@@ -912,7 +912,7 @@
                 return;
             }
 
-            const GrBuffer* indexBuffer;
+            const GrIndexBuffer* indexBuffer;
             int firstIndex;
 
             uint16_t *idxs = target->makeIndexSpace(indexCount, &indexBuffer, &firstIndex);