From aff329b8e9b239bca1d93b13a914fbef45ccf7fe Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 11 Aug 2017 09:40:37 -0400 Subject: 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 Reviewed-by: Brian Osman --- src/shaders/SkImageShader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/shaders/SkImageShader.cpp') diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp index 609ad4b869..edd1f41dca 100644 --- a/src/shaders/SkImageShader.cpp +++ b/src/shaders/SkImageShader.cpp @@ -167,8 +167,8 @@ void SkImageShader::toString(SkString* str) const { #include "effects/GrBicubicEffect.h" #include "effects/GrSimpleTextureEffect.h" -sk_sp SkImageShader::asFragmentProcessor(const AsFPArgs& args) const { - +std::unique_ptr SkImageShader::asFragmentProcessor( + const AsFPArgs& args) const { SkMatrix lmInverse; if (!this->getLocalMatrix().invert(&lmInverse)) { return nullptr; @@ -207,7 +207,7 @@ sk_sp SkImageShader::asFragmentProcessor(const AsFPArgs& ar sk_sp colorSpaceXform = GrColorSpaceXform::Make(texColorSpace.get(), args.fDstColorSpace); - sk_sp inner; + std::unique_ptr inner; if (doBicubic) { inner = GrBicubicEffect::Make(std::move(proxy), std::move(colorSpaceXform), lmInverse, tm); @@ -219,7 +219,7 @@ sk_sp SkImageShader::asFragmentProcessor(const AsFPArgs& ar if (isAlphaOnly) { return inner; } - return sk_sp(GrFragmentProcessor::MulOutputByInputAlpha(std::move(inner))); + return GrFragmentProcessor::MulOutputByInputAlpha(std::move(inner)); } #endif -- cgit v1.2.3