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/effects/SkOverdrawColorFilter.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/effects/SkOverdrawColorFilter.cpp') diff --git a/src/effects/SkOverdrawColorFilter.cpp b/src/effects/SkOverdrawColorFilter.cpp index 4eb9bfcaeb..8ca699e89f 100644 --- a/src/effects/SkOverdrawColorFilter.cpp +++ b/src/effects/SkOverdrawColorFilter.cpp @@ -73,12 +73,12 @@ SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END class OverdrawFragmentProcessor : public GrFragmentProcessor { public: - static sk_sp Make(const SkPMColor* colors); + static std::unique_ptr Make(const SkPMColor* colors); const char* name() const override { return "Overdraw"; } - sk_sp clone() const override { - return sk_sp(new OverdrawFragmentProcessor(fColors)); + std::unique_ptr clone() const override { + return std::unique_ptr(new OverdrawFragmentProcessor(fColors)); } private: @@ -108,12 +108,12 @@ private: typedef GrGLSLFragmentProcessor INHERITED; }; -sk_sp SkOverdrawColorFilter::asFragmentProcessor(GrContext*, - SkColorSpace*) const { +std::unique_ptr SkOverdrawColorFilter::asFragmentProcessor( + GrContext*, SkColorSpace*) const { return OverdrawFragmentProcessor::Make(fColors); } -sk_sp OverdrawFragmentProcessor::Make(const SkPMColor* colors) { +std::unique_ptr OverdrawFragmentProcessor::Make(const SkPMColor* colors) { GrColor4f grColors[SkOverdrawColorFilter::kNumColors]; for (int i = 0; i < SkOverdrawColorFilter::kNumColors; i++) { grColors[i] = GrColor4f::FromGrColor(GrColorPackRGBA(SkGetPackedR32(colors[i]), @@ -122,7 +122,7 @@ sk_sp OverdrawFragmentProcessor::Make(const SkPMColor* colo SkGetPackedA32(colors[i]))); } - return sk_sp(new OverdrawFragmentProcessor(grColors)); + return std::unique_ptr(new OverdrawFragmentProcessor(grColors)); } // This could implement the constant input -> constant output optimization, but we don't really -- cgit v1.2.3