aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench/MorphologyBench.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2016-04-05 09:09:36 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-05 09:09:37 -0700
commitfc11b0afe0ca922a42767d4a656ed640008da1bb (patch)
treeeb84a2ba05f37c8e7b9c721f38bc93bac27b5bcb /bench/MorphologyBench.cpp
parentb8797bb7b74adcab1d198de3ef4f0871b0bb6718 (diff)
Update SkMorphology ImageFilters to sk_sp
Diffstat (limited to 'bench/MorphologyBench.cpp')
-rw-r--r--bench/MorphologyBench.cpp18
1 files changed, 10 insertions, 8 deletions
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<SkImageFilter> 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);
}