Move DrawInfo out from GrDrawTarget and rename to GrVertices.

src/gpu/GrAAHairLinePathRenderer.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAAHairLinePathRenderer.h"
 
 #include "GrBatch.h"
@@ skipping 871 matching lines @@
 
         SkASSERT(lineGP->getVertexStride() == sizeof(LineVertex));
 
         LineVertex* verts = reinterpret_cast<LineVertex*>(vertices);
         for (int i = 0; i < lineCount; ++i) {
             add_line(&lines[2*i], toSrc, this->coverage(), &verts);
         }
 
         {
             int linesLeft = lineCount;
-            GrDrawTarget::DrawInfo info;
+            GrVertices info;
             info.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, linesIndexBuffer,
                                firstVertex, kLineSegNumVertices, kIdxsPerLineSeg, &linesLeft,
                                kLineSegsNumInIdxBuffer);
             do {
                 batchTarget->draw(info);
             } while (info.nextInstances(&linesLeft, kLineSegsNumInIdxBuffer));
         }
     }
 
     if (quadCount || conicCount) {
@@ skipping 35 matching lines @@
             // TODO remove this when batch is everywhere
             GrPipelineInfo init;
             init.fColorIgnored = fBatch.fColorIgnored;
             init.fOverrideColor = GrColor_ILLEGAL;
             init.fCoverageIgnored = fBatch.fCoverageIgnored;
             init.fUsesLocalCoords = this->usesLocalCoords();
             quadGP->initBatchTracker(batchTarget->currentBatchTracker(), init);
 
             {
                 int quadsLeft = quadCount;
-                GrDrawTarget::DrawInfo info;
+                GrVertices info;
                 info.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, quadsIndexBuffer,
                                    firstVertex, kQuadNumVertices, kIdxsPerQuad, &quadsLeft,
                                    kQuadsNumInIdxBuffer);
                do {
                    batchTarget->draw(info);
                } while (info.nextInstances(&quadsLeft, kQuadsNumInIdxBuffer));
                firstVertex += quadCount * kQuadNumVertices;
            }
         }
 
         if (conicCount > 0) {
             batchTarget->initDraw(conicGP, pipeline);
 
             // TODO remove this when batch is everywhere
             GrPipelineInfo init;
             init.fColorIgnored = fBatch.fColorIgnored;
             init.fOverrideColor = GrColor_ILLEGAL;
             init.fCoverageIgnored = fBatch.fCoverageIgnored;
             init.fUsesLocalCoords = this->usesLocalCoords();
             conicGP->initBatchTracker(batchTarget->currentBatchTracker(), init);
 
             {
                 int conicsLeft = conicCount;
-                GrDrawTarget::DrawInfo info;
+                GrVertices info;
                 info.initInstanced(kTriangles_GrPrimitiveType, vertexBuffer, quadsIndexBuffer,
                                   firstVertex, kQuadNumVertices, kIdxsPerQuad, &conicsLeft,
                                   kQuadsNumInIdxBuffer);
                 do {
                     batchTarget->draw(info);
                 } while (info.nextInstances(&conicsLeft, kQuadsNumInIdxBuffer));
             }
         }
     }
 }
@@ skipping 45 matching lines @@
     GrColor color = GrRandomColor(random);
     SkMatrix viewMatrix = GrTest::TestMatrix(random);
     GrStrokeInfo stroke(SkStrokeRec::kHairline_InitStyle);
     SkPath path = GrTest::TestPath(random);
     SkIRect devClipBounds;
     devClipBounds.setEmpty();
     return create_hairline_batch(color, viewMatrix, path, stroke, devClipBounds);
 }
 
 #endif