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

src/gpu/batches/GrDrawVerticesBatch.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 "GrDrawVerticesBatch.h"
 
 #include "GrBatchTarget.h"
@@ skipping 166 matching lines @@
         vertices.initIndexed(this->primitiveType(), vertexBuffer, indexBuffer, firstVertex,
                              firstIndex, this->vertexCount(), this->indexCount());
 
     } else {
         vertices.init(this->primitiveType(), vertexBuffer, firstVertex, this->vertexCount());
     }
     batchTarget->draw(vertices);
 }
 
 bool GrDrawVerticesBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
-    if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(), t->bounds(),
-                                caps)) {
+    GrDrawVerticesBatch* that = t->cast<GrDrawVerticesBatch>();
+
+    if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                that->bounds(), caps)) {
         return false;
     }
 
-    GrDrawVerticesBatch* that = t->cast<GrDrawVerticesBatch>();
-
     if (!this->batchablePrimitiveType() || this->primitiveType() != that->primitiveType()) {
         return false;
     }
 
     SkASSERT(this->usesLocalCoords() == that->usesLocalCoords());
 
     // We currently use a uniform viewmatrix for this batch
     if (!this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
         return false;
     }
@@ skipping 84 matching lines @@
         if (hasColors) {
             colors->push_back(GrRandomColor(random));
         }
         if (hasIndices) {
             SkASSERT(maxVertex <= SK_MaxU16);
             indices->push_back(random->nextULessThan((uint16_t)maxVertex));
         }
     }
 }
 
-BATCH_TEST_DEFINE(VerticesBatch) {
+DRAW_BATCH_TEST_DEFINE(VerticesBatch) {
     GrPrimitiveType type = GrPrimitiveType(random->nextULessThan(kLast_GrPrimitiveType + 1));
     uint32_t primitiveCount = random->nextRangeU(1, 100);
 
     // TODO make 'sensible' indexbuffers
     SkTArray<SkPoint> positions;
     SkTArray<SkPoint> texCoords;
     SkTArray<GrColor> colors;
     SkTArray<uint16_t> indices;
 
     bool hasTexCoords = random->nextBool();
@@ skipping 31 matching lines @@
     geometry.fColor = GrRandomColor(random);
     return GrDrawVerticesBatch::Create(geometry, type, viewMatrix,
                                        positions.begin(), vertexCount,
                                        indices.begin(), hasIndices ? vertexCount : 0,
                                        colors.begin(),
                                        texCoords.begin(),
                                        bounds);
 }
 
 #endif