commit 25a880960a9a689a745a01071ecba3fe494b5940
author Brian Salomon <bsalomon@google.com> Thu Dec 01 09:36:50 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Dec 01 15:12:53 2016 +0000
tree ebc0576bf054ed6a1ea63e2a2034cc8e19374543
parent 7c3e7180948766321c51d165737555e78910de51

Rename GrBatch to GrOp

Change-Id: I27b6324f8040899fafeda23ca524bc54a4dbf090
Reviewed-on: https://skia-review.googlesource.com/5392
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/gpu/batches/GrNonAAStrokeRectBatch.cpp

diff --git a/src/gpu/batches/GrNonAAStrokeRectBatch.cpp b/src/gpu/batches/GrNonAAStrokeRectBatch.cpp
index 9139dab..2cc1a7d 100644
--- a/src/gpu/batches/GrNonAAStrokeRectBatch.cpp
+++ b/src/gpu/batches/GrNonAAStrokeRectBatch.cpp
@@ -47,7 +47,7 @@
 
 class NonAAStrokeRectBatch : public GrVertexBatch {
 public:
-    DEFINE_BATCH_CLASS_ID
+    DEFINE_OP_CLASS_ID
 
     const char* name() const override { return "NonAAStrokeRectBatch"; }
 
@@ -167,7 +167,7 @@
         fOverrides = overrides;
     }
 
-    bool onCombineIfPossible(GrBatch* t, const GrCaps&) override {
+    bool onCombineIfPossible(GrOp* t, const GrCaps&) override {
         // NonAA stroke rects cannot batch right now
         // TODO make these batchable
         return false;