Introduce GrBatch subclasses GrDrawBatch and GrVertexBatch to prepare for non-drawing batches

src/gpu/batches/GrRectBatchFactory.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 "GrRectBatchFactory.h"
 
 #include "GrAAStrokeRectBatch.h"
 #include "GrStrokeRectBatch.h"
 
 #include "SkStrokeRec.h"
 
-static GrBatch* create_stroke_aa_batch(GrColor color,
-                                       const SkMatrix& viewMatrix,
-                                       const SkRect& devOutside,
-                                       const SkRect& devOutsideAssist,
-                                       const SkRect& devInside,
-                                       bool miterStroke) {
+static GrDrawBatch* create_stroke_aa_batch(GrColor color,
+                                           const SkMatrix& viewMatrix,
+                                           const SkRect& devOutside,
+                                           const SkRect& devOutsideAssist,
+                                           const SkRect& devInside,
+                                           bool miterStroke) {
     GrAAStrokeRectBatch::Geometry geometry;
     geometry.fColor = color;
     geometry.fDevOutside = devOutside;
     geometry.fDevOutsideAssist = devOutsideAssist;
     geometry.fDevInside = devInside;
     geometry.fMiterStroke = miterStroke;
 
     return GrAAStrokeRectBatch::Create(geometry, viewMatrix);
 }
 
 namespace GrRectBatchFactory {
 
-
-GrBatch* CreateStrokeBW(GrColor color,
-                        const SkMatrix& viewMatrix,
-                        const SkRect& rect,
-                        SkScalar strokeWidth,
-                        bool snapToPixelCenters) {
+GrDrawBatch* CreateStrokeBW(GrColor color,
+                            const SkMatrix& viewMatrix,
+                            const SkRect& rect,
+                            SkScalar strokeWidth,
+                            bool snapToPixelCenters) {
     GrStrokeRectBatch::Geometry geometry;
     geometry.fColor = color;
     geometry.fViewMatrix = viewMatrix;
     geometry.fRect = rect;
     geometry.fStrokeWidth = strokeWidth;
     return GrStrokeRectBatch::Create(geometry, snapToPixelCenters);
 }
 
-GrBatch* CreateStrokeAA(GrColor color,
-                        const SkMatrix& viewMatrix,
-                        const SkRect& rect,
-                        const SkRect& devRect,
-                        const SkStrokeRec& stroke) {
+GrDrawBatch* CreateStrokeAA(GrColor color,
+                            const SkMatrix& viewMatrix,
+                            const SkRect& rect,
+                            const SkRect& devRect,
+                            const SkStrokeRec& stroke) {
     SkVector devStrokeSize;
     SkScalar width = stroke.getWidth();
     if (width > 0) {
         devStrokeSize.set(width, width);
         viewMatrix.mapVectors(&devStrokeSize, 1);
         devStrokeSize.setAbs(devStrokeSize);
     } else {
         devStrokeSize.set(SK_Scalar1, SK_Scalar1);
     }
 
@@ skipping 34 matching lines @@
     // edge, while vertex number of inner edge is 4, the same as miter-stroke.
     if (!miterStroke) {
         devOutside.inset(0, ry);
         devOutsideAssist.outset(0, ry);
     }
 
     return create_stroke_aa_batch(color, viewMatrix, devOutside, devOutsideAssist, devInside,
                                   miterStroke);
 }
 
-GrBatch* CreateFillNestedRectsAA(GrColor color,
-                                 const SkMatrix& viewMatrix,
-                                 const SkRect rects[2]) {
+GrDrawBatch* CreateFillNestedRectsAA(GrColor color,
+                                     const SkMatrix& viewMatrix,
+                                     const SkRect rects[2]) {
     SkASSERT(viewMatrix.rectStaysRect());
     SkASSERT(!rects[0].isEmpty() && !rects[1].isEmpty());
 
     SkRect devOutside, devInside;
     viewMatrix.mapRect(&devOutside, rects[0]);
     viewMatrix.mapRect(&devInside, rects[1]);
 
     if (devInside.isEmpty()) {
         return CreateFillAA(color, viewMatrix, devOutside, devOutside);
     }
 
     return create_stroke_aa_batch(color, viewMatrix, devOutside, devOutside, devInside, true);
 }
 
 };