From 5605b56afa5bd89f3148b397318b616fccfd4004 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Tue, 5 Apr 2016 11:50:42 -0700 Subject: Update SkColorFilterImageFilter to sk_sp TBR=reed@google.com GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1858813002 Review URL: https://codereview.chromium.org/1858813002 --- bench/ImageFilterCollapse.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'bench/ImageFilterCollapse.cpp') diff --git a/bench/ImageFilterCollapse.cpp b/bench/ImageFilterCollapse.cpp index cafcd38c6e..d85d1de330 100644 --- a/bench/ImageFilterCollapse.cpp +++ b/bench/ImageFilterCollapse.cpp @@ -22,20 +22,15 @@ class BaseImageFilterCollapseBench : public Benchmark { public: - BaseImageFilterCollapseBench(): fImageFilter(nullptr) {} - ~BaseImageFilterCollapseBench() { - SkSafeUnref(fImageFilter); - } + BaseImageFilterCollapseBench() {} protected: void doPreDraw(sk_sp colorFilters[], int nFilters) { + SkASSERT(!fImageFilter); + // Create a chain of ImageFilters from colorFilters - fImageFilter = nullptr; for(int i = nFilters; i --> 0;) { - SkAutoTUnref filter( - SkColorFilterImageFilter::Create(colorFilters[i].get(), fImageFilter, nullptr) - ); - SkRefCnt_SafeAssign(fImageFilter, filter.get()); + fImageFilter = SkColorFilterImageFilter::Make(colorFilters[i], fImageFilter); } } @@ -50,7 +45,7 @@ protected: } private: - SkImageFilter* fImageFilter; + sk_sp fImageFilter; SkBitmap fBitmap; void makeBitmap() { @@ -95,7 +90,7 @@ protected: SkTableColorFilter::Make(table3), }; - doPreDraw(colorFilters, SK_ARRAY_COUNT(colorFilters)); + this->doPreDraw(colorFilters, SK_ARRAY_COUNT(colorFilters)); } private: @@ -134,7 +129,7 @@ protected: make_brightness(-0.1f), }; - doPreDraw(colorFilters, SK_ARRAY_COUNT(colorFilters)); + this->doPreDraw(colorFilters, SK_ARRAY_COUNT(colorFilters)); } }; -- cgit v1.2.3