diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-08-11 09:40:37 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-11 14:13:26 +0000 |
| commit | aff329b8e9b239bca1d93b13a914fbef45ccf7fe (patch) | |
| tree | 06ba42a557c6695f145bcf4956c981fc87af55ff /src/gpu/effects/GrMatrixConvolutionEffect.h | |
| parent | e2cbd0451832ec71d1b498e0f64d02b7d096b2b7 (diff) | |
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>
Diffstat (limited to 'src/gpu/effects/GrMatrixConvolutionEffect.h')
| -rw-r--r-- | src/gpu/effects/GrMatrixConvolutionEffect.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.h b/src/gpu/effects/GrMatrixConvolutionEffect.h index 9ece00ee5d..2e859b1cdd 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.h +++ b/src/gpu/effects/GrMatrixConvolutionEffect.h @@ -16,30 +16,30 @@ class GrMatrixConvolutionEffect : public GrFragmentProcessor { public: - static sk_sp<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, - const SkIRect& bounds, - const SkISize& kernelSize, - const SkScalar* kernel, - SkScalar gain, - SkScalar bias, - const SkIPoint& kernelOffset, - GrTextureDomain::Mode tileMode, - bool convolveAlpha) { - return sk_sp<GrFragmentProcessor>( - new GrMatrixConvolutionEffect(std::move(proxy), bounds, kernelSize, - kernel, gain, bias, kernelOffset, tileMode, convolveAlpha)); + static std::unique_ptr<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, + const SkIRect& bounds, + const SkISize& kernelSize, + const SkScalar* kernel, + SkScalar gain, + SkScalar bias, + const SkIPoint& kernelOffset, + GrTextureDomain::Mode tileMode, + bool convolveAlpha) { + return std::unique_ptr<GrFragmentProcessor>( + new GrMatrixConvolutionEffect(std::move(proxy), bounds, kernelSize, kernel, gain, + bias, kernelOffset, tileMode, convolveAlpha)); } - static sk_sp<GrFragmentProcessor> MakeGaussian(sk_sp<GrTextureProxy> proxy, - const SkIRect& bounds, - const SkISize& kernelSize, - SkScalar gain, - SkScalar bias, - const SkIPoint& kernelOffset, - GrTextureDomain::Mode tileMode, - bool convolveAlpha, - SkScalar sigmaX, - SkScalar sigmaY); + static std::unique_ptr<GrFragmentProcessor> MakeGaussian(sk_sp<GrTextureProxy> proxy, + const SkIRect& bounds, + const SkISize& kernelSize, + SkScalar gain, + SkScalar bias, + const SkIPoint& kernelOffset, + GrTextureDomain::Mode tileMode, + bool convolveAlpha, + SkScalar sigmaX, + SkScalar sigmaY); const SkIRect& bounds() const { return fBounds; } const SkISize& kernelSize() const { return fKernelSize; } @@ -52,7 +52,7 @@ public: const char* name() const override { return "MatrixConvolution"; } - sk_sp<GrFragmentProcessor> clone() const override; + std::unique_ptr<GrFragmentProcessor> clone() const override; private: GrMatrixConvolutionEffect(sk_sp<GrTextureProxy> proxy, |