Make GrVertexBatch objects hold their own draws during GrDrawTarget flush

tests/GrPorterDuffTest.cpp

 /*
  * 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 "SkXfermode.h"
 #include "Test.h"
 
@@ skipping 893 matching lines @@
         }
 
         void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
             out->setUnknownFourComponents();
             out->setUsingLCDCoverage();
         }
 
         const char* name() const override { return "Test LCD Text Batch"; }
         void initBatchTracker(const GrPipelineOptimizations&) override {}
         bool onCombineIfPossible(GrBatch*, const GrCaps&) override  { return false; }
-        void generateGeometry(GrBatchTarget*) override {}
+        void onPrepareDraws(Target*) override {};
 
     } testLCDCoverageBatch;
 
     GrProcOptInfo colorPOI, covPOI;
     colorPOI.calcColorWithBatch(&testLCDCoverageBatch, NULL, 0);
     covPOI.calcCoverageWithBatch(&testLCDCoverageBatch, NULL, 0);
 
     SkASSERT(kRGBA_GrColorComponentFlags == colorPOI.validFlags());
     SkASSERT(covPOI.isFourChannelOutput());
 
@@ skipping 83 matching lines @@
                 TEST_ASSERT(!xp->hasSecondaryOutput());
                 xp->getOptimizations(colorPOI, covPOI, false, 0, caps);
                 TEST_ASSERT(!xp->hasSecondaryOutput());
             }
         }
     }
 }
 
 #endif