commit f8334781914363caf537f22f012fcd5c03c60dad
author Brian Salomon <bsalomon@google.com> Tue Jan 03 09:42:58 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 03 15:22:16 2017 +0000
tree cfa54aa4a80cd7841959300c245d633fbcd382a0
parent 5f500920e719b215d5e0e36a6679995ed3c9b4ad

Remove ref counting from GrOp.

Instead use std::unique_ptr to manage GrOp lifetime.

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

src/gpu/ops/GrStencilAndCoverPathRenderer.cpp

diff --git a/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp b/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
index 16765e0..5a83e0e 100644
--- a/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
+++ b/src/gpu/ops/GrStencilAndCoverPathRenderer.cpp
@@ -112,8 +112,8 @@
         }
         const SkMatrix& viewM = viewMatrix.hasPerspective() ? SkMatrix::I() : viewMatrix;
 
-        sk_sp<GrDrawOp> coverOp(GrRectOpFactory::MakeNonAAFill(args.fPaint->getColor(), viewM,
-                                                               bounds, nullptr, &invert));
+        std::unique_ptr<GrDrawOp> coverOp(GrRectOpFactory::MakeNonAAFill(
+                args.fPaint->getColor(), viewM, bounds, nullptr, &invert));
 
         // fake inverse with a stencil and cover
         args.fRenderTargetContext->priv().stencilPath(*args.fClip, args.fAAType, viewMatrix,
@@ -154,7 +154,8 @@
                 0xffff>()
         );
 
-        sk_sp<GrDrawOp> op = GrDrawPathOp::Make(viewMatrix, args.fPaint->getColor(), path.get());
+        std::unique_ptr<GrDrawOp> op =
+                GrDrawPathOp::Make(viewMatrix, args.fPaint->getColor(), path.get());
 
         GrPipelineBuilder pipelineBuilder(*args.fPaint, args.fAAType);
         pipelineBuilder.setUserStencil(&kCoverPass);