From fc11b0afe0ca922a42767d4a656ed640008da1bb Mon Sep 17 00:00:00 2001 From: robertphillips Date: Tue, 5 Apr 2016 09:09:36 -0700 Subject: Update SkMorphology ImageFilters to sk_sp TBR=reed@google.com GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1860573002 Review URL: https://codereview.chromium.org/1860573002 --- bench/MorphologyBench.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'bench/MorphologyBench.cpp') diff --git a/bench/MorphologyBench.cpp b/bench/MorphologyBench.cpp index fd60ebed46..5edae6e299 100644 --- a/bench/MorphologyBench.cpp +++ b/bench/MorphologyBench.cpp @@ -46,11 +46,11 @@ public: } protected: - virtual const char* onGetName() { + const char* onGetName() override { return fName.c_str(); } - virtual void onDraw(int loops, SkCanvas* canvas) { + void onDraw(int loops, SkCanvas* canvas) override { SkPaint paint; this->setupPaint(&paint); @@ -63,18 +63,20 @@ protected: r.offset(fRadius, fRadius); if (fRadius > 0) { - SkImageFilter* mf = nullptr; + sk_sp mf; switch (fStyle) { case kDilate_MT: - mf = SkDilateImageFilter::Create(SkScalarFloorToInt(fRadius), - SkScalarFloorToInt(fRadius)); + mf = SkDilateImageFilter::Make(SkScalarFloorToInt(fRadius), + SkScalarFloorToInt(fRadius), + nullptr); break; case kErode_MT: - mf = SkErodeImageFilter::Create(SkScalarFloorToInt(fRadius), - SkScalarFloorToInt(fRadius)); + mf = SkErodeImageFilter::Make(SkScalarFloorToInt(fRadius), + SkScalarFloorToInt(fRadius), + nullptr); break; } - paint.setImageFilter(mf)->unref(); + paint.setImageFilter(std::move(mf)); } canvas->drawOval(r, paint); } -- cgit v1.2.3