commit 24f19780d1e76595c049d8cad4352de839cfc6b5
author Brian Salomon <bsalomon@google.com> Tue Dec 13 15:10:11 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 13 20:48:50 2016 +0000
tree 43caf0b20dddaf2687451ae0f8096bfc639dbda2
parent d5aabd6744b64e2bfc48b4dec2311ce58e6f9225

Make GrRenderTargetContext::addDrawOp use sk_sp

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

src/gpu/batches/GrDashLinePathRenderer.cpp

diff --git a/src/gpu/batches/GrDashLinePathRenderer.cpp b/src/gpu/batches/GrDashLinePathRenderer.cpp
index 9304885..1bda9d5 100644
--- a/src/gpu/batches/GrDashLinePathRenderer.cpp
+++ b/src/gpu/batches/GrDashLinePathRenderer.cpp
@@ -45,18 +45,15 @@
     }
     SkPoint pts[2];
     SkAssertResult(args.fShape->asLine(pts, nullptr));
-    sk_sp<GrDrawOp> batch(GrDashingEffect::CreateDashLineBatch(args.fPaint->getColor(),
-                                                               *args.fViewMatrix,
-                                                               pts,
-                                                               aaMode,
-                                                               args.fShape->style()));
-    if (!batch) {
+    sk_sp<GrDrawOp> op(GrDashingEffect::CreateDashLineBatch(
+            args.fPaint->getColor(), *args.fViewMatrix, pts, aaMode, args.fShape->style()));
+    if (!op) {
         return false;
     }
 
     GrPipelineBuilder pipelineBuilder(*args.fPaint, args.fAAType);
     pipelineBuilder.setUserStencil(args.fUserStencilSettings);
 
-    args.fRenderTargetContext->addDrawOp(pipelineBuilder, *args.fClip, batch.get());
+    args.fRenderTargetContext->addDrawOp(pipelineBuilder, *args.fClip, std::move(op));
     return true;
 }