Simplify GrDrawBatch uploads and token uage.

src/gpu/batches/GrNonAAStrokeRectBatch.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 "GrNonAAStrokeRectBatch.h"
 
 #include "GrBatchTest.h"
@@ skipping 99 matching lines @@
             using namespace GrDefaultGeoProcFactory;
             Color color(this->color());
             Coverage coverage(this->coverageIgnored() ? Coverage::kSolid_Type :
                                                         Coverage::kNone_Type);
             LocalCoords localCoords(this->usesLocalCoords() ? LocalCoords::kUsePosition_Type :
                                                               LocalCoords::kUnused_Type);
             gp.reset(GrDefaultGeoProcFactory::Create(color, coverage, localCoords,
                                                      this->viewMatrix()));
         }
 
-        target->initDraw(gp);
-
         size_t vertexStride = gp->getVertexStride();
 
         SkASSERT(vertexStride == sizeof(GrDefaultGeoProcFactory::PositionAttr));
 
         const Geometry& args = fGeoData[0];
 
         int vertexCount = kVertsPerHairlineRect;
         if (args.fStrokeWidth > 0) {
             vertexCount = kVertsPerStrokeRect;
         }
@@ skipping 20 matching lines @@
             primType = kLineStrip_GrPrimitiveType;
             vertex[0].set(args.fRect.fLeft, args.fRect.fTop);
             vertex[1].set(args.fRect.fRight, args.fRect.fTop);
             vertex[2].set(args.fRect.fRight, args.fRect.fBottom);
             vertex[3].set(args.fRect.fLeft, args.fRect.fBottom);
             vertex[4].set(args.fRect.fLeft, args.fRect.fTop);
         }
 
         GrMesh mesh;
         mesh.init(primType, vertexBuffer, firstVertex, vertexCount);
-        target->draw(mesh);
+        target->draw(gp, mesh);
     }
 
     void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
         // Handle any color overrides
         if (!overrides.readsColor()) {
             fGeoData[0].fColor = GrColor_ILLEGAL;
         }
         overrides.getOverrideColorIfSet(&fGeoData[0].fColor);
 
         // setup batch properties
@@ skipping 71 matching lines @@
 DRAW_BATCH_TEST_DEFINE(NonAAStrokeRectBatch) {
     SkMatrix viewMatrix = GrTest::TestMatrix(random);
     GrColor color = GrRandomColor(random);
     SkRect rect = GrTest::TestRect(random);
     SkScalar strokeWidth = random->nextBool() ? 0.0f : 1.0f;
 
     return GrNonAAStrokeRectBatch::Create(color, viewMatrix, rect, strokeWidth, random->nextBool());
 }
 
 #endif