Make GrVertexBatch objects hold their own draws during GrDrawTarget flush

src/gpu/GrBatchTarget.cpp

Index: src/gpu/GrBatchTarget.cpp
diff --git a/src/gpu/GrBatchTarget.cpp b/src/gpu/GrBatchTarget.cpp
deleted file mode 100644
index b6dadd699ba994201000db13f7425c44cbff7c6d..0000000000000000000000000000000000000000
--- a/src/gpu/GrBatchTarget.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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 "GrBatchTarget.h"
-
-#include "GrBatchAtlas.h"
-#include "GrPipeline.h"
-
-GrBatchTarget::GrBatchTarget(GrGpu* gpu)
-    : fGpu(gpu)
-    , fVertexPool(gpu)
-    , fIndexPool(gpu)
-    , fFlushBuffer(kFlushBufferInitialSizeInBytes)
-    , fIter(fFlushBuffer)
-    , fNumberOfDraws(0)
-    , fCurrentToken(0)
-    , fLastFlushedToken(0)
-    , fInlineUpdatesIndex(0) {
-}
-
-void GrBatchTarget::flushNext(int n)  {
-    for (; n > 0; n--) {
-        fLastFlushedToken++;
-        SkDEBUGCODE(bool verify =) fIter.next();
-        SkASSERT(verify);
-
-        BufferedFlush* bf = fIter.get();
-
-        // Flush all texture uploads
-        int uploadCount = fInlineUploads.count();
-        while (fInlineUpdatesIndex < uploadCount &&
-               fInlineUploads[fInlineUpdatesIndex]->lastUploadToken() <= fLastFlushedToken) {
-            fInlineUploads[fInlineUpdatesIndex++]->upload(TextureUploader(fGpu));
-        }
-
-        GrProgramDesc desc;
-        const GrPipeline* pipeline = bf->fPipeline;
-        const GrPrimitiveProcessor* primProc = bf->fPrimitiveProcessor.get();
-        fGpu->buildProgramDesc(&desc, *primProc, *pipeline, bf->fBatchTracker);
-
-        GrGpu::DrawArgs args(primProc, pipeline, &desc, &bf->fBatchTracker);
-
-        int drawCount = bf->fVertexDraws.count();
-        const SkSTArray<1, GrVertices, true>& vertexDraws = bf->fVertexDraws;
-        for (int i = 0; i < drawCount; i++) {
-            fGpu->draw(args, vertexDraws[i]);
-        }
-    }
-}
-
-void* GrBatchTarget::makeVertSpace(size_t vertexSize, int vertexCount,
-                    const GrVertexBuffer** buffer, int* startVertex) {
-    return fVertexPool.makeSpace(vertexSize, vertexCount, buffer, startVertex);
-}
-
-uint16_t* GrBatchTarget::makeIndexSpace(int indexCount,
-                                        const GrIndexBuffer** buffer, int* startIndex) {
-    return reinterpret_cast<uint16_t*>(fIndexPool.makeSpace(indexCount, buffer, startIndex));
-}
-