commit aff329b8e9b239bca1d93b13a914fbef45ccf7fe
author Brian Salomon <bsalomon@google.com> Fri Aug 11 09:40:37 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Aug 11 14:13:26 2017 +0000
tree 06ba42a557c6695f145bcf4956c981fc87af55ff
parent e2cbd0451832ec71d1b498e0f64d02b7d096b2b7

Make GrFragmentProcessor be non-refcounted and use std::unique_ptr.

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

src/gpu/GrYUVProvider.cpp

diff --git a/src/gpu/GrYUVProvider.cpp b/src/gpu/GrYUVProvider.cpp
index 12390aa..6b58d42 100644
--- a/src/gpu/GrYUVProvider.cpp
+++ b/src/gpu/GrYUVProvider.cpp
@@ -134,11 +134,11 @@
     }
 
     GrPaint paint;
-    sk_sp<GrFragmentProcessor> yuvToRgbProcessor(
-        GrYUVEffect::MakeYUVToRGB(yuvTextureContexts[0]->asTextureProxyRef(),
-                                  yuvTextureContexts[1]->asTextureProxyRef(),
-                                  yuvTextureContexts[2]->asTextureProxyRef(),
-                                  yuvInfo.fSizeInfo.fSizes, yuvInfo.fColorSpace, false));
+    auto yuvToRgbProcessor =
+            GrYUVEffect::MakeYUVToRGB(yuvTextureContexts[0]->asTextureProxyRef(),
+                                      yuvTextureContexts[1]->asTextureProxyRef(),
+                                      yuvTextureContexts[2]->asTextureProxyRef(),
+                                      yuvInfo.fSizeInfo.fSizes, yuvInfo.fColorSpace, false);
     paint.addColorFragmentProcessor(std::move(yuvToRgbProcessor));
 
     // If we're decoding an sRGB image, the result of our linear math on the YUV planes is already
@@ -158,10 +158,10 @@
 
     // If the caller expects the pixels in a different color space than the one from the image,
     // apply a color conversion to do this.
-    sk_sp<GrFragmentProcessor> colorConversionProcessor =
+    std::unique_ptr<GrFragmentProcessor> colorConversionProcessor =
             GrNonlinearColorSpaceXformEffect::Make(srcColorSpace, dstColorSpace);
     if (colorConversionProcessor) {
-        paint.addColorFragmentProcessor(colorConversionProcessor);
+        paint.addColorFragmentProcessor(std::move(colorConversionProcessor));
     }
 
     paint.setPorterDuffXPFactory(SkBlendMode::kSrc);