Start using GrGpuCommandBuffer in GrDrawTarget.

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"
@@ skipping 44 matching lines @@
     SkAutoTUnref<const GrBuffer> quadIndexBuffer(
         target->resourceProvider()->refQuadIndexBuffer());
     if (!quadIndexBuffer) {
         SkDebugf("Could not get quad index buffer.");
         return nullptr;
     }
     return this->INHERITED::init(target, kTriangles_GrPrimitiveType, vertexStride,
                                  quadIndexBuffer, kVerticesPerQuad, kIndicesPerQuad, quadsToDraw);
 }
 
-void GrVertexBatch::onDraw(GrBatchFlushState* state) {
+void GrVertexBatch::onDraw(GrBatchFlushState* state, GrGpuCommandBuffer* buffer) {
     int currUploadIdx = 0;
     int currMeshIdx = 0;
 
     SkASSERT(fQueuedDraws.empty() || fBaseDrawToken == state->nextTokenToFlush());
 
     for (int currDrawIdx = 0; currDrawIdx < fQueuedDraws.count(); ++currDrawIdx) {
         GrBatchDrawToken drawToken = state->nextTokenToFlush();
         while (currUploadIdx < fInlineUploads.count() &&
                fInlineUploads[currUploadIdx].fUploadBeforeToken == drawToken) {
             state->doUpload(fInlineUploads[currUploadIdx++].fUpload);
         }
         const QueuedDraw &draw = fQueuedDraws[currDrawIdx];
-        state->gpu()->draw(*this->pipeline(), *draw.fGeometryProcessor.get(),
-                           fMeshes.begin() + currMeshIdx, draw.fMeshCnt);
+        buffer->draw(*this->pipeline(), *draw.fGeometryProcessor.get(),
+                     fMeshes.begin() + currMeshIdx, draw.fMeshCnt);
         currMeshIdx += draw.fMeshCnt;
         state->flushToken();
     }
     SkASSERT(currUploadIdx == fInlineUploads.count());
     SkASSERT(currMeshIdx == fMeshes.count());
     fQueuedDraws.reset();
     fInlineUploads.reset();
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ skipping 13 matching lines @@
         }
     }
     GrVertexBatch::QueuedDraw& draw = this->vertexBatch()->fQueuedDraws.push_back();
     GrBatchDrawToken token = this->state()->issueDrawToken();
     draw.fGeometryProcessor.reset(gp);
     draw.fMeshCnt = 1;
     if (batch->fQueuedDraws.count() == 1) {
         batch->fBaseDrawToken = token;
     }
 }