commit 9afd371a8a66f992f98eb2a3fc75ae64bddc730b
author Brian Salomon <bsalomon@google.com> Thu Dec 01 10:59:09 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Dec 01 16:45:27 2016 +0000
tree 7c4853fe590fa370be28e92fe772356aa61b9ccd
parent 62458a6778bc39eea5360301a67d192b3a263df1

Rename GrDrawBatch->GrDrawOp

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

src/gpu/instanced/InstancedRendering.cpp

diff --git a/src/gpu/instanced/InstancedRendering.cpp b/src/gpu/instanced/InstancedRendering.cpp
index a46f24b..fb0d53c 100644
--- a/src/gpu/instanced/InstancedRendering.cpp
+++ b/src/gpu/instanced/InstancedRendering.cpp
@@ -21,24 +21,24 @@
       fDrawPool(1024, 1024) {
 }
 
-GrDrawBatch* InstancedRendering::recordRect(const SkRect& rect, const SkMatrix& viewMatrix,
-                                            GrColor color, bool antialias,
-                                            const GrInstancedPipelineInfo& info, bool* useHWAA) {
+GrDrawOp* InstancedRendering::recordRect(const SkRect& rect, const SkMatrix& viewMatrix,
+                                         GrColor color, bool antialias,
+                                         const GrInstancedPipelineInfo& info, bool* useHWAA) {
     return this->recordShape(ShapeType::kRect, rect, viewMatrix, color, rect, antialias, info,
                              useHWAA);
 }
 
-GrDrawBatch* InstancedRendering::recordRect(const SkRect& rect, const SkMatrix& viewMatrix,
-                                            GrColor color, const SkRect& localRect, bool antialias,
-                                            const GrInstancedPipelineInfo& info, bool* useHWAA) {
+GrDrawOp* InstancedRendering::recordRect(const SkRect& rect, const SkMatrix& viewMatrix,
+                                         GrColor color, const SkRect& localRect, bool antialias,
+                                         const GrInstancedPipelineInfo& info, bool* useHWAA) {
     return this->recordShape(ShapeType::kRect, rect, viewMatrix, color, localRect, antialias, info,
                              useHWAA);
 }
 
-GrDrawBatch* InstancedRendering::recordRect(const SkRect& rect, const SkMatrix& viewMatrix,
-                                            GrColor color, const SkMatrix& localMatrix,
-                                            bool antialias, const GrInstancedPipelineInfo& info,
-                                            bool* useHWAA) {
+GrDrawOp* InstancedRendering::recordRect(const SkRect& rect, const SkMatrix& viewMatrix,
+                                         GrColor color, const SkMatrix& localMatrix,
+                                         bool antialias, const GrInstancedPipelineInfo& info,
+                                         bool* useHWAA) {
     if (localMatrix.hasPerspective()) {
         return nullptr; // Perspective is not yet supported in the local matrix.
     }
@@ -55,16 +55,16 @@
     return nullptr;
 }
 
-GrDrawBatch* InstancedRendering::recordOval(const SkRect& oval, const SkMatrix& viewMatrix,
-                                            GrColor color, bool antialias,
-                                            const GrInstancedPipelineInfo& info, bool* useHWAA) {
+GrDrawOp* InstancedRendering::recordOval(const SkRect& oval, const SkMatrix& viewMatrix,
+                                         GrColor color, bool antialias,
+                                         const GrInstancedPipelineInfo& info, bool* useHWAA) {
     return this->recordShape(ShapeType::kOval, oval, viewMatrix, color, oval, antialias, info,
                              useHWAA);
 }
 
-GrDrawBatch* InstancedRendering::recordRRect(const SkRRect& rrect, const SkMatrix& viewMatrix,
-                                             GrColor color, bool antialias,
-                                             const GrInstancedPipelineInfo& info, bool* useHWAA) {
+GrDrawOp* InstancedRendering::recordRRect(const SkRRect& rrect, const SkMatrix& viewMatrix,
+                                          GrColor color, bool antialias,
+                                          const GrInstancedPipelineInfo& info, bool* useHWAA) {
     if (Batch* batch = this->recordShape(GetRRectShapeType(rrect), rrect.rect(), viewMatrix, color,
                                          rrect.rect(), antialias, info, useHWAA)) {
         batch->appendRRectParams(rrect);
@@ -73,10 +73,10 @@
     return nullptr;
 }
 
-GrDrawBatch* InstancedRendering::recordDRRect(const SkRRect& outer, const SkRRect& inner,
-                                              const SkMatrix& viewMatrix, GrColor color,
-                                              bool antialias, const GrInstancedPipelineInfo& info,
-                                              bool* useHWAA) {
+GrDrawOp* InstancedRendering::recordDRRect(const SkRRect& outer, const SkRRect& inner,
+                                           const SkMatrix& viewMatrix, GrColor color,
+                                           bool antialias, const GrInstancedPipelineInfo& info,
+                                           bool* useHWAA) {
     if (inner.getType() > SkRRect::kSimple_Type) {
        return nullptr; // Complex inner round rects are not yet supported.
     }