Isolate GrBufferAllocPools inside GrBatchTarget

src/gpu/GrDefaultPathRenderer.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDefaultPathRenderer.h"
 
 #include "GrBatch.h"
 #include "GrBatchTarget.h"
 #include "GrBatchTest.h"
-#include "GrBufferAllocPool.h"
 #include "GrContext.h"
 #include "GrDefaultGeoProcFactory.h"
 #include "GrPathUtils.h"
 #include "GrPipelineBuilder.h"
 #include "GrVertices.h"
 #include "SkGeometry.h"
 #include "SkString.h"
 #include "SkStrokeRec.h"
 #include "SkTLazy.h"
 #include "SkTraceEvent.h"
@@ skipping 289 matching lines @@
                 primitiveType = kTriangles_GrPrimitiveType;
             } else {
                 primitiveType = kTriangleFan_GrPrimitiveType;
             }
         }
 
         // allocate vertex / index buffers
         const GrVertexBuffer* vertexBuffer;
         int firstVertex;
 
-        void* verts = batchTarget->vertexPool()->makeSpace(vertexStride,
-                                                           maxVertices,
-                                                           &vertexBuffer,
-                                                           &firstVertex);
+        void* verts = batchTarget->makeVertSpace(vertexStride, maxVertices,
+                                                 &vertexBuffer, &firstVertex);
 
         if (!verts) {
             SkDebugf("Could not allocate vertices\n");
             return;
         }
 
         const GrIndexBuffer* indexBuffer = NULL;
         int firstIndex = 0;
 
         void* indices = NULL;
         if (isIndexed) {
-            indices = batchTarget->indexPool()->makeSpace(maxIndices,
-                                                          &indexBuffer,
-                                                          &firstIndex);
+            indices = batchTarget->makeIndexSpace(maxIndices, &indexBuffer, &firstIndex);
 
             if (!indices) {
                 SkDebugf("Could not allocate indices\n");
                 return;
             }
         }
 
         // fill buffers
         int vertexOffset = 0;
         int indexOffset = 0;
@@ skipping 421 matching lines @@
     geometry.fColor = color;
     geometry.fPath = path;
     geometry.fTolerance = srcSpaceTol;
 
     viewMatrix.mapRect(&bounds);
     uint8_t coverage = GrRandomCoverage(random);
     return DefaultPathBatch::Create(geometry, coverage, viewMatrix, true, bounds);
 }
 
 #endif