commit a6aa590efc8201747c069f9da2285250957df01b
author Brian Salomon <bsalomon@google.com> Fri Dec 16 09:32:00 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 16 15:14:00 2016 +0000
tree fdb819245639b5f4bfdd867bec32fb236fc673b7
parent 334df3a5627809110e7819346dacdb5233269fdc

Rename batch->op and sk_sp for all remaining path renderer classes.

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

src/gpu/batches/GrDashLinePathRenderer.cpp

diff --git a/src/gpu/batches/GrDashLinePathRenderer.cpp b/src/gpu/batches/GrDashLinePathRenderer.cpp
index 1bda9d5..94bf26c 100644
--- a/src/gpu/batches/GrDashLinePathRenderer.cpp
+++ b/src/gpu/batches/GrDashLinePathRenderer.cpp
@@ -10,7 +10,7 @@
 #include "GrAuditTrail.h"
 #include "GrGpu.h"
 #include "GrPipelineBuilder.h"
-#include "effects/GrDashingEffect.h"
+#include "batches/GrDashOp.h"
 
 bool GrDashLinePathRenderer::onCanDrawPath(const CanDrawPathArgs& args) const {
     SkPoint pts[2];
@@ -21,7 +21,7 @@
         }
         // We should never have an inverse dashed case.
         SkASSERT(!inverted);
-        return GrDashingEffect::CanDrawDashLine(pts, args.fShape->style(), *args.fViewMatrix);
+        return GrDashOp::CanDrawDashLine(pts, args.fShape->style(), *args.fViewMatrix);
     }
     return false;
 }
@@ -29,24 +29,24 @@
 bool GrDashLinePathRenderer::onDrawPath(const DrawPathArgs& args) {
     GR_AUDIT_TRAIL_AUTO_FRAME(args.fRenderTargetContext->auditTrail(),
                               "GrDashLinePathRenderer::onDrawPath");
-    GrDashingEffect::AAMode aaMode = GrDashingEffect::AAMode::kNone;
+    GrDashOp::AAMode aaMode = GrDashOp::AAMode::kNone;
     switch (args.fAAType) {
         case GrAAType::kNone:
             break;
         case GrAAType::kCoverage:
         case GrAAType::kMixedSamples:
-            aaMode = GrDashingEffect::AAMode::kCoverage;
+            aaMode = GrDashOp::AAMode::kCoverage;
             break;
         case GrAAType::kMSAA:
             // In this mode we will use aa between dashes but the outer border uses MSAA. Otherwise,
             // we can wind up with external edges antialiased and internal edges unantialiased.
-            aaMode = GrDashingEffect::AAMode::kCoverageWithMSAA;
+            aaMode = GrDashOp::AAMode::kCoverageWithMSAA;
             break;
     }
     SkPoint pts[2];
     SkAssertResult(args.fShape->asLine(pts, nullptr));
-    sk_sp<GrDrawOp> op(GrDashingEffect::CreateDashLineBatch(
-            args.fPaint->getColor(), *args.fViewMatrix, pts, aaMode, args.fShape->style()));
+    sk_sp<GrDrawOp> op = GrDashOp::MakeDashLineOp(
+            args.fPaint->getColor(), *args.fViewMatrix, pts, aaMode, args.fShape->style());
     if (!op) {
         return false;
     }