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/GrSimpleTextureEffect.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/GrSimpleTextureEffect.h')
| -rw-r--r-- | src/gpu/effects/GrSimpleTextureEffect.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/GrSimpleTextureEffect.h index 25ef1c5bd0..11564bb6e2 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.h +++ b/src/gpu/effects/GrSimpleTextureEffect.h @@ -20,35 +20,35 @@ public: sk_sp<GrColorSpaceXform> colorXform() const { return fColorXform; } SkMatrix44 matrix() const { return fMatrix; } - static sk_sp<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, - sk_sp<GrColorSpaceXform> - colorSpaceXform, - const SkMatrix& matrix) { - return sk_sp<GrFragmentProcessor>(new GrSimpleTextureEffect( + static std::unique_ptr<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, + sk_sp<GrColorSpaceXform> + colorSpaceXform, + const SkMatrix& matrix) { + return std::unique_ptr<GrFragmentProcessor>(new GrSimpleTextureEffect( std::move(proxy), std::move(colorSpaceXform), matrix, GrSamplerParams(SkShader::kClamp_TileMode, GrSamplerParams::kNone_FilterMode))); } - static sk_sp<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, - sk_sp<GrColorSpaceXform> - colorSpaceXform, - const SkMatrix& matrix, - GrSamplerParams::FilterMode filterMode) { - return sk_sp<GrFragmentProcessor>( + static std::unique_ptr<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, + sk_sp<GrColorSpaceXform> + colorSpaceXform, + const SkMatrix& matrix, + GrSamplerParams::FilterMode filterMode) { + return std::unique_ptr<GrFragmentProcessor>( new GrSimpleTextureEffect(std::move(proxy), std::move(colorSpaceXform), matrix, GrSamplerParams(SkShader::kClamp_TileMode, filterMode))); } - static sk_sp<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, - sk_sp<GrColorSpaceXform> - colorSpaceXform, - const SkMatrix& matrix, - const GrSamplerParams& p) { - return sk_sp<GrFragmentProcessor>( + static std::unique_ptr<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, + sk_sp<GrColorSpaceXform> + colorSpaceXform, + const SkMatrix& matrix, + const GrSamplerParams& p) { + return std::unique_ptr<GrFragmentProcessor>( new GrSimpleTextureEffect(std::move(proxy), std::move(colorSpaceXform), matrix, p)); } GrSimpleTextureEffect(const GrSimpleTextureEffect& src); - sk_sp<GrFragmentProcessor> clone() const override; + std::unique_ptr<GrFragmentProcessor> clone() const override; const char* name() const override { return "SimpleTextureEffect"; } private: |