Put clear and discard into GrBatch.

src/gpu/batches/GrVertexBatch.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 "GrVertexBatch.h"
 #include "GrBatchFlushState.h"
 #include "GrResourceProvider.h"
 
 GrVertexBatch::GrVertexBatch() : fDrawArrays(1) {}
 
-void GrVertexBatch::prepareDraws(GrBatchFlushState* state) {
+void GrVertexBatch::onPrepare(GrBatchFlushState* state) {
     Target target(state, this);
     this->onPrepareDraws(&target);
 }
 
 void* GrVertexBatch::InstancedHelper::init(Target* target, GrPrimitiveType primType,
                                            size_t vertexStride, const GrIndexBuffer* indexBuffer,
                                            int verticesPerInstance, int indicesPerInstance,
                                            int instancesToDraw) {
     SkASSERT(target);
     if (!indexBuffer) {
@@ skipping 27 matching lines @@
     SkAutoTUnref<const GrIndexBuffer> quadIndexBuffer(
         target->resourceProvider()->refQuadIndexBuffer());
     if (!quadIndexBuffer) {
         SkDebugf("Could not get quad index buffer.");
         return NULL;
     }
     return this->INHERITED::init(target, kTriangles_GrPrimitiveType, vertexStride,
                                  quadIndexBuffer, kVerticesPerQuad, kIndicesPerQuad, quadsToDraw);
 }
 
-void GrVertexBatch::issueDraws(GrBatchFlushState* state) {
+void GrVertexBatch::onDraw(GrBatchFlushState* state) {
     int uploadCnt = fInlineUploads.count();
     int currUpload = 0;
 
     // Iterate of all the drawArrays. Before issuing the draws in each array, perform any inline
     // uploads.
     for (SkTLList<DrawArray>::Iter da(fDrawArrays); da.get(); da.next()) {
         state->advanceLastFlushedToken();
         while (currUpload < uploadCnt &&
                fInlineUploads[currUpload]->lastUploadToken() <= state->lastFlushedToken()) {
             fInlineUploads[currUpload++]->upload(state->uploader());
         }
         const GrVertexBatch::DrawArray& drawArray = *da.get();
         GrProgramDesc desc;
         const GrPipeline* pipeline = this->pipeline();
         const GrPrimitiveProcessor* primProc = drawArray.fPrimitiveProcessor.get();
         state->gpu()->buildProgramDesc(&desc, *primProc, *pipeline, fBatchTracker);
         GrGpu::DrawArgs args(primProc, pipeline, &desc, &fBatchTracker);
 
         int drawCount = drawArray.fDraws.count();
         for (int i = 0; i < drawCount; i++) {
             state->gpu()->draw(args,  drawArray.fDraws[i]);
         }
     }
 }