commit ebb38256c65f2d799dd64f0274256a0c1deffed1
author Brian Salomon <bsalomon@google.com> Tue Jul 11 15:52:40 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 12 15:44:33 2017 +0000
tree 420ddcf4db46b5431be785c054cf77f4eef00baa
parent baf981f71614e7a2fbe6af2726e65126d431ed8e

Make DashOp a non-legacy GrMeshDrawOp.

Change-Id: I84ee3c64a5af8889e9a122cbc08d70ed6b25fbab
Reviewed-on: https://skia-review.googlesource.com/22210
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/ops/GrDashLinePathRenderer.cpp

diff --git a/src/gpu/ops/GrDashLinePathRenderer.cpp b/src/gpu/ops/GrDashLinePathRenderer.cpp
index cafe247..a364d92 100644
--- a/src/gpu/ops/GrDashLinePathRenderer.cpp
+++ b/src/gpu/ops/GrDashLinePathRenderer.cpp
@@ -46,16 +46,12 @@
     }
     SkPoint pts[2];
     SkAssertResult(args.fShape->asLine(pts, nullptr));
-    std::unique_ptr<GrLegacyMeshDrawOp> op = GrDashOp::MakeDashLineOp(
-            args.fPaint.getColor(), *args.fViewMatrix, pts, aaMode, args.fShape->style());
+    std::unique_ptr<GrDrawOp> op =
+            GrDashOp::MakeDashLineOp(std::move(args.fPaint), *args.fViewMatrix, pts, aaMode,
+                                     args.fShape->style(), args.fUserStencilSettings);
     if (!op) {
         return false;
     }
-
-    GrPipelineBuilder pipelineBuilder(std::move(args.fPaint), args.fAAType);
-    pipelineBuilder.setUserStencil(args.fUserStencilSettings);
-
-    args.fRenderTargetContext->addLegacyMeshDrawOp(
-            std::move(pipelineBuilder), *args.fClip, std::move(op));
+    args.fRenderTargetContext->addDrawOp(*args.fClip, std::move(op));
     return true;
 }