diff options
| author |  bungeman <bungeman@google.com> | 2016-06-09 08:01:03 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-09 08:01:03 -0700 |
| commit | 06ca8ec87cf6fab57cadd043a5ac18c4154a4129 (patch) | |
| tree | 95e7eaaaf3f42ce550332277c431e3ec119446f4 /src/effects/SkArithmeticMode_gpu.h | |
| parent | 897a8e38879643d81a64d2bb6bed4e22af982aa4 (diff) | |
sk_sp for Ganesh.
Convert use of GrFragmentProcessor, GrGeometryProcessor, and
GrXPFactory to sk_sp. This clarifies ownership and should
reduce reference count churn by moving ownership.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2041113004
Review-Url: https://codereview.chromium.org/2041113004
Diffstat (limited to 'src/effects/SkArithmeticMode_gpu.h')
| -rw-r--r-- | src/effects/SkArithmeticMode_gpu.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/effects/SkArithmeticMode_gpu.h b/src/effects/SkArithmeticMode_gpu.h index b8a40cf827..98cbaf90a5 100644 --- a/src/effects/SkArithmeticMode_gpu.h +++ b/src/effects/SkArithmeticMode_gpu.h @@ -31,9 +31,10 @@ class GrGLArtithmeticFP; class GrArithmeticFP : public GrFragmentProcessor { public: - static const GrFragmentProcessor* Create(float k1, float k2, float k3, float k4, - bool enforcePMColor, const GrFragmentProcessor* dst) { - return new GrArithmeticFP(k1, k2, k3, k4, enforcePMColor, dst); + static sk_sp<GrFragmentProcessor> Make(float k1, float k2, float k3, float k4, + bool enforcePMColor, sk_sp<GrFragmentProcessor> dst) { + return sk_sp<GrFragmentProcessor>(new GrArithmeticFP(k1, k2, k3, k4, enforcePMColor, + std::move(dst))); } ~GrArithmeticFP() override {}; @@ -62,7 +63,7 @@ private: void onComputeInvariantOutput(GrInvariantOutput* inout) const override; GrArithmeticFP(float k1, float k2, float k3, float k4, bool enforcePMColor, - const GrFragmentProcessor* dst); + sk_sp<GrFragmentProcessor> dst); float fK1, fK2, fK3, fK4; bool fEnforcePMColor; @@ -77,8 +78,8 @@ private: class GrArithmeticXPFactory : public GrXPFactory { public: - static GrXPFactory* Create(float k1, float k2, float k3, float k4, bool enforcePMColor) { - return new GrArithmeticXPFactory(k1, k2, k3, k4, enforcePMColor); + static sk_sp<GrXPFactory> Make(float k1, float k2, float k3, float k4, bool enforcePMColor) { + return sk_sp<GrXPFactory>(new GrArithmeticXPFactory(k1, k2, k3, k4, enforcePMColor)); } void getInvariantBlendedColor(const GrProcOptInfo& colorPOI, |