Revert of Refactor GrBufferAllocPools to use resource cache

src/gpu/GrBatchTarget.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 GrBatchBuffer_DEFINED
 #define GrBatchBuffer_DEFINED
 
@@ skipping 102 matching lines @@
     const GrDrawTargetCaps& caps() const { return *fGpu->caps(); }
 
     GrResourceProvider* resourceProvider() const { return fGpu->getContext()->resourceProvider(); }
 
     void* makeVertSpace(size_t vertexSize, int vertexCount,
                         const GrVertexBuffer** buffer, int* startVertex);
     uint16_t* makeIndexSpace(int indexCount,
                              const GrIndexBuffer** buffer, int* startIndex);
 
     // A helper for draws which overallocate and then return data to the pool
-    void putBackIndices(size_t indices) { fIndexPool.putBack(indices * sizeof(uint16_t)); }
+    void putBackIndices(size_t indices) { fIndexPool->putBack(indices * sizeof(uint16_t)); }
 
     void putBackVertices(size_t vertices, size_t vertexStride) {
-        fVertexPool.putBack(vertices * vertexStride);
+        fVertexPool->putBack(vertices * vertexStride);
     }
 
     void reset() {
-        fVertexPool.reset();
-        fIndexPool.reset();    
+        fVertexPool->reset();
+        fIndexPool->reset();    
     }
 
 private:
     void unmapVertexAndIndexBuffers() {
-        fVertexPool.unmap();
-        fIndexPool.unmap();
+        fVertexPool->unmap();
+        fIndexPool->unmap();
     }
 
     GrGpu* fGpu;
-    GrVertexBufferAllocPool fVertexPool;
-    GrIndexBufferAllocPool fIndexPool;
+    SkAutoTDelete<GrVertexBufferAllocPool> fVertexPool;
+    SkAutoTDelete<GrIndexBufferAllocPool> fIndexPool;
 
     typedef void* TBufferAlign; // This wouldn't be enough align if a command used long double.
 
     struct BufferedFlush {
         BufferedFlush(const GrPrimitiveProcessor* primProc, const GrPipeline* pipeline)
             : fPrimitiveProcessor(primProc)
             , fPipeline(pipeline) {}
         typedef GrPendingProgramElement<const GrPrimitiveProcessor> ProgramPrimitiveProcessor;
         ProgramPrimitiveProcessor fPrimitiveProcessor;
         const GrPipeline* fPipeline;
@@ skipping 12 matching lines @@
     FlushBuffer::Iter fIter;
     int fNumberOfDraws;
     BatchToken fCurrentToken;
     BatchToken fLastFlushedToken; // The next token to be flushed
     SkTArray<SkAutoTUnref<Uploader>, true> fAsapUploads;
     SkTArray<SkAutoTUnref<Uploader>, true> fInlineUploads;
     int fInlineUpdatesIndex;
 };
 
 #endif