Make GrVertexBatch objects hold their own draws during GrDrawTarget flush

src/gpu/batches/GrTestBatch.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 GrTestBatch_DEFINED
 #define GrTestBatch_DEFINED
 
-#include "GrBatchTarget.h"
+#include "GrBatchFlushState.h"
 #include "GrGeometryProcessor.h"
 #include "GrVertexBuffer.h"
 
 #include "batches/GrVertexBatch.h"
 
 /*
  * A simple batch only for testing purposes which actually doesn't batch at all, but can fit into
  * the batch pipeline and generate arbitrary geometry
  */
 class GrTestBatch : public GrVertexBatch {
@@ skipping 20 matching lines @@
         }
         opt.getOverrideColorIfSet(&this->geoData(0)->fColor);
 
         // setup batch properties
         fBatch.fColorIgnored = !opt.readsColor();
         fBatch.fColor = this->geoData(0)->fColor;
         fBatch.fUsesLocalCoords = opt.readsLocalCoords();
         fBatch.fCoverageIgnored = !opt.readsCoverage();
     }
 
-    void generateGeometry(GrBatchTarget* batchTarget) override {
-        batchTarget->initDraw(fGeometryProcessor, this->pipeline());
-
-        this->onGenerateGeometry(batchTarget);
-    }
-
 protected:
     GrTestBatch(const GrGeometryProcessor* gp, const SkRect& bounds) {
         fGeometryProcessor.reset(SkRef(gp));
 
         this->setBounds(bounds);
     }
 
     const GrGeometryProcessor* geometryProcessor() const { return fGeometryProcessor; }
 
 private:
+    void onPrepareDraws(Target* target) override {
+        target->initDraw(fGeometryProcessor, this->pipeline());
+        this->generateGeometry(target);
+    }
+
     virtual Geometry* geoData(int index) = 0;
     virtual const Geometry* geoData(int index) const = 0;
 
     bool onCombineIfPossible(GrBatch* t, const GrCaps&) override {
         return false;
     }
 
-    virtual void onGenerateGeometry(GrBatchTarget* batchTarget) = 0;
+    virtual void generateGeometry(Target*) = 0;
 
     struct BatchTracker {
         GrColor fColor;
         bool fUsesLocalCoords;
         bool fColorIgnored;
         bool fCoverageIgnored;
     };
 
     SkAutoTUnref<const GrGeometryProcessor> fGeometryProcessor;
     BatchTracker fBatch;
 };
 
 #endif