| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "Benchmark.h" | 8 #include "Benchmark.h" |
| 9 #include "SkCanvas.h" | 9 #include "SkCanvas.h" |
| 10 #include "SkMorphologyImageFilter.h" | 10 #include "SkMorphologyImageFilter.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 fStyle = style; | 39 fStyle = style; |
| 40 const char* name = rad > 0 ? gStyleName[style] : "none"; | 40 const char* name = rad > 0 ? gStyleName[style] : "none"; |
| 41 if (SkScalarFraction(rad) != 0) { | 41 if (SkScalarFraction(rad) != 0) { |
| 42 fName.printf("morph_%.2f_%s", SkScalarToFloat(rad), name); | 42 fName.printf("morph_%.2f_%s", SkScalarToFloat(rad), name); |
| 43 } else { | 43 } else { |
| 44 fName.printf("morph_%d_%s", SkScalarRoundToInt(rad), name); | 44 fName.printf("morph_%d_%s", SkScalarRoundToInt(rad), name); |
| 45 } | 45 } |
| 46 } | 46 } |
| 47 | 47 |
| 48 protected: | 48 protected: |
| 49 virtual const char* onGetName() { | 49 const char* onGetName() override { |
| 50 return fName.c_str(); | 50 return fName.c_str(); |
| 51 } | 51 } |
| 52 | 52 |
| 53 virtual void onDraw(int loops, SkCanvas* canvas) { | 53 void onDraw(int loops, SkCanvas* canvas) override { |
| 54 SkPaint paint; | 54 SkPaint paint; |
| 55 this->setupPaint(&paint); | 55 this->setupPaint(&paint); |
| 56 | 56 |
| 57 paint.setAntiAlias(true); | 57 paint.setAntiAlias(true); |
| 58 | 58 |
| 59 SkRandom rand; | 59 SkRandom rand; |
| 60 for (int i = 0; i < loops; i++) { | 60 for (int i = 0; i < loops; i++) { |
| 61 SkRect r = SkRect::MakeWH(rand.nextUScalar1() * 400, | 61 SkRect r = SkRect::MakeWH(rand.nextUScalar1() * 400, |
| 62 rand.nextUScalar1() * 400); | 62 rand.nextUScalar1() * 400); |
| 63 r.offset(fRadius, fRadius); | 63 r.offset(fRadius, fRadius); |
| 64 | 64 |
| 65 if (fRadius > 0) { | 65 if (fRadius > 0) { |
| 66 SkImageFilter* mf = nullptr; | 66 sk_sp<SkImageFilter> mf; |
| 67 switch (fStyle) { | 67 switch (fStyle) { |
| 68 case kDilate_MT: | 68 case kDilate_MT: |
| 69 mf = SkDilateImageFilter::Create(SkScalarFloorToInt(fRadius)
, | 69 mf = SkDilateImageFilter::Make(SkScalarFloorToInt(fRadius), |
| 70 SkScalarFloorToInt(fRadius))
; | 70 SkScalarFloorToInt(fRadius), |
| 71 nullptr); |
| 71 break; | 72 break; |
| 72 case kErode_MT: | 73 case kErode_MT: |
| 73 mf = SkErodeImageFilter::Create(SkScalarFloorToInt(fRadius), | 74 mf = SkErodeImageFilter::Make(SkScalarFloorToInt(fRadius), |
| 74 SkScalarFloorToInt(fRadius))
; | 75 SkScalarFloorToInt(fRadius), |
| 76 nullptr); |
| 75 break; | 77 break; |
| 76 } | 78 } |
| 77 paint.setImageFilter(mf)->unref(); | 79 paint.setImageFilter(std::move(mf)); |
| 78 } | 80 } |
| 79 canvas->drawOval(r, paint); | 81 canvas->drawOval(r, paint); |
| 80 } | 82 } |
| 81 } | 83 } |
| 82 | 84 |
| 83 private: | 85 private: |
| 84 typedef Benchmark INHERITED; | 86 typedef Benchmark INHERITED; |
| 85 }; | 87 }; |
| 86 | 88 |
| 87 DEF_BENCH( return new MorphologyBench(SMALL, kErode_MT); ) | 89 DEF_BENCH( return new MorphologyBench(SMALL, kErode_MT); ) |
| 88 DEF_BENCH( return new MorphologyBench(SMALL, kDilate_MT); ) | 90 DEF_BENCH( return new MorphologyBench(SMALL, kDilate_MT); ) |
| 89 | 91 |
| 90 DEF_BENCH( return new MorphologyBench(BIG, kErode_MT); ) | 92 DEF_BENCH( return new MorphologyBench(BIG, kErode_MT); ) |
| 91 DEF_BENCH( return new MorphologyBench(BIG, kDilate_MT); ) | 93 DEF_BENCH( return new MorphologyBench(BIG, kDilate_MT); ) |
| 92 | 94 |
| 93 DEF_BENCH( return new MorphologyBench(REAL, kErode_MT); ) | 95 DEF_BENCH( return new MorphologyBench(REAL, kErode_MT); ) |
| 94 DEF_BENCH( return new MorphologyBench(REAL, kDilate_MT); ) | 96 DEF_BENCH( return new MorphologyBench(REAL, kDilate_MT); ) |
| 95 | 97 |
| 96 DEF_BENCH( return new MorphologyBench(0, kErode_MT); ) | 98 DEF_BENCH( return new MorphologyBench(0, kErode_MT); ) |
| OLD | NEW |