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/GrDrawPathBatch.h

diff --git a/src/gpu/batches/GrDrawPathBatch.h b/src/gpu/batches/GrDrawPathBatch.h
index 3a46f46..9de29e2 100644
--- a/src/gpu/batches/GrDrawPathBatch.h
+++ b/src/gpu/batches/GrDrawPathBatch.h
@@ -63,7 +63,7 @@
 
 class GrDrawPathBatch final : public GrDrawPathBatchBase {
 public:
-    DEFINE_BATCH_CLASS_ID
+    DEFINE_OP_CLASS_ID
 
     static GrDrawBatch* Create(const SkMatrix& viewMatrix, GrColor color, const GrPath* path) {
         return new GrDrawPathBatch(viewMatrix, color, path);
@@ -80,7 +80,7 @@
         this->setTransformedBounds(path->getBounds(), viewMatrix, HasAABloat::kNo, IsZeroArea::kNo);
     }
 
-    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override { return false; }
+    bool onCombineIfPossible(GrOp* t, const GrCaps& caps) override { return false; }
 
     void onDraw(GrBatchFlushState* state, const SkRect& bounds) override;
 
@@ -94,7 +94,7 @@
 public:
     typedef GrPathRendering::PathTransformType TransformType;
 
-    DEFINE_BATCH_CLASS_ID
+    DEFINE_OP_CLASS_ID
 
     struct InstanceData : public SkNoncopyable {
     public:
@@ -173,7 +173,7 @@
 
     TransformType transformType() const { return fDraws.head()->fInstanceData->transformType(); }
 
-    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override;
+    bool onCombineIfPossible(GrOp* t, const GrCaps& caps) override;
 
     void onDraw(GrBatchFlushState* state, const SkRect& bounds) override;