| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 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 "SkBlurMask.h" | 9 #include "SkBlurMask.h" |
| 10 #include "SkCanvas.h" | 10 #include "SkCanvas.h" |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 } else { | 84 } else { |
| 85 name.printf("blurrect_direct_%d", SkScalarRoundToInt(rad)); | 85 name.printf("blurrect_direct_%d", SkScalarRoundToInt(rad)); |
| 86 } | 86 } |
| 87 | 87 |
| 88 this->setName(name); | 88 this->setName(name); |
| 89 } | 89 } |
| 90 protected: | 90 protected: |
| 91 virtual void makeBlurryRect(const SkRect& r) SK_OVERRIDE { | 91 virtual void makeBlurryRect(const SkRect& r) SK_OVERRIDE { |
| 92 SkMask mask; | 92 SkMask mask; |
| 93 SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()), | 93 SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()), |
| 94 &mask, r, kNormal_SkBlurStyle); | 94 &mask, NULL, r, kNormal_SkBlurStyle); |
| 95 SkMask::FreeImage(mask.fImage); | 95 SkMask::FreeImage(mask.fImage); |
| 96 } | 96 } |
| 97 private: | 97 private: |
| 98 typedef BlurRectBench INHERITED; | 98 typedef BlurRectBench INHERITED; |
| 99 }; | 99 }; |
| 100 | 100 |
| 101 class BlurRectSeparableBench: public BlurRectBench { | 101 class BlurRectSeparableBench: public BlurRectBench { |
| 102 | 102 |
| 103 public: | 103 public: |
| 104 BlurRectSeparableBench(SkScalar rad) : INHERITED(rad) { | 104 BlurRectSeparableBench(SkScalar rad) : INHERITED(rad) { |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 } | 138 } |
| 139 | 139 |
| 140 this->setName(name); | 140 this->setName(name); |
| 141 } | 141 } |
| 142 | 142 |
| 143 protected: | 143 protected: |
| 144 | 144 |
| 145 virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE { | 145 virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE { |
| 146 SkMask mask; | 146 SkMask mask; |
| 147 mask.fImage = NULL; | 147 mask.fImage = NULL; |
| 148 SkBlurMask::BoxBlur(&mask, fSrcMask, SkBlurMask::ConvertRadiusToSigma(th
is->radius()), | 148 SkBlurMask::BoxBlur(&mask, NULL, fSrcMask, SkBlurMask::ConvertRadiusToSi
gma(this->radius()), |
| 149 kNormal_SkBlurStyle, kHigh_SkBlurQuality); | 149 kNormal_SkBlurStyle, kHigh_SkBlurQuality); |
| 150 SkMask::FreeImage(mask.fImage); | 150 SkMask::FreeImage(mask.fImage); |
| 151 } | 151 } |
| 152 private: | 152 private: |
| 153 typedef BlurRectSeparableBench INHERITED; | 153 typedef BlurRectSeparableBench INHERITED; |
| 154 }; | 154 }; |
| 155 | 155 |
| 156 class BlurRectGaussianBench: public BlurRectSeparableBench { | 156 class BlurRectGaussianBench: public BlurRectSeparableBench { |
| 157 public: | 157 public: |
| 158 BlurRectGaussianBench(SkScalar rad) : INHERITED(rad) { | 158 BlurRectGaussianBench(SkScalar rad) : INHERITED(rad) { |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(12));) | 219 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(12));) |
| 220 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(13));) | 220 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(13));) |
| 221 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(14));) | 221 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(14));) |
| 222 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(15));) | 222 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(15));) |
| 223 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(16));) | 223 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(16));) |
| 224 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(17));) | 224 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(17));) |
| 225 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(18));) | 225 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(18));) |
| 226 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(19));) | 226 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(19));) |
| 227 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(20));) | 227 DEF_BENCH(return new BlurRectGaussianBench(SkIntToScalar(20));) |
| 228 #endif | 228 #endif |
| OLD | NEW |