Make GrVertexBatch objects hold their own draws during GrDrawTarget flush

src/gpu/batches/GrDrawVerticesBatch.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 GrDrawVerticesBatch_DEFINED
 #define GrDrawVerticesBatch_DEFINED
 
 #include "GrColor.h"
 #include "GrTypes.h"
 #include "GrVertexBatch.h"
 #include "SkMatrix.h"
 #include "SkRect.h"
 #include "SkTDArray.h"
 
-class GrBatchTarget;
+class GrBatchFlushState;
 struct GrInitInvariantOutput;
 
 class GrDrawVerticesBatch : public GrVertexBatch {
 public:
     struct Geometry {
         GrColor fColor;
         SkTDArray<SkPoint> fPositions;
         SkTDArray<uint16_t> fIndices;
         SkTDArray<GrColor> fColors;
         SkTDArray<SkPoint> fLocalCoords;
@@ skipping 11 matching lines @@
     }
 
     const char* name() const override { return "DrawVerticesBatch"; }
 
     void getInvariantOutputColor(GrInitInvariantOutput* out) const override;
 
     void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override;
 
     void initBatchTracker(const GrPipelineOptimizations&) override;
 
-    void generateGeometry(GrBatchTarget* batchTarget) override;
-
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
 private:
+    void onPrepareDraws(Target*) override;
+
     GrDrawVerticesBatch(const Geometry& geometry, GrPrimitiveType primitiveType,
                         const SkMatrix& viewMatrix,
                         const SkPoint* positions, int vertexCount,
                         const uint16_t* indices, int indexCount,
                         const GrColor* colors, const SkPoint* localCoords, const SkRect& bounds);
 
     GrPrimitiveType primitiveType() const { return fBatch.fPrimitiveType; }
     bool batchablePrimitiveType() const {
         return kTriangles_GrPrimitiveType == fBatch.fPrimitiveType ||
                kLines_GrPrimitiveType == fBatch.fPrimitiveType ||
@@ skipping 24 matching lines @@
         bool fHasLocalCoords;
         int fVertexCount;
         int fIndexCount;
     };
 
     BatchTracker fBatch;
     SkSTArray<1, Geometry, true> fGeoData;
 };
 
 #endif