commit abd30f54b7ff1704a8930c4307ea242d09425d02
author bsalomon <bsalomon@google.com> Thu Aug 13 13:34:48 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 13 13:34:48 2015 -0700
tree 08eb5fdaa2fbe55f2e763a1d3c05054896919b68
parent 8f34372f7e97482e5e61ab298b7edaa008ba2f4c

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

Review URL: https://codereview.chromium.org/1293583002

src/gpu/batches/GrAAStrokeRectBatch.cpp

diff --git a/src/gpu/batches/GrAAStrokeRectBatch.cpp b/src/gpu/batches/GrAAStrokeRectBatch.cpp
index 0083aaa..91ff230 100644
--- a/src/gpu/batches/GrAAStrokeRectBatch.cpp
+++ b/src/gpu/batches/GrAAStrokeRectBatch.cpp
@@ -204,13 +204,13 @@
 }
 
 bool GrAAStrokeRectBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
-    if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(), t->bounds(),
-                                caps)) {
+    GrAAStrokeRectBatch* that = t->cast<GrAAStrokeRectBatch>();
+
+    if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *that->pipeline(),
+                                that->bounds(), caps)) {
         return false;
     }
 
-    GrAAStrokeRectBatch* that = t->cast<GrAAStrokeRectBatch>();
-
     // TODO batch across miterstroke changes
     if (this->miterStroke() != that->miterStroke()) {
         return false;
@@ -356,7 +356,7 @@
 
 #include "GrBatchTest.h"
 
-BATCH_TEST_DEFINE(AAStrokeRectBatch) {
+DRAW_BATCH_TEST_DEFINE(AAStrokeRectBatch) {
     bool miterStroke = random->nextBool();
 
     // Create mock stroke rect