diff options
| author |  Mike Reed <reed@google.com> | 2018-03-14 13:01:17 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-14 17:27:36 +0000 |
| commit | 1be1f8d097da4d4c07b4a1fa16013b0d440e4308 (patch) | |
| tree | 0d0d96a7ad0dcf35cc40838c5f0041e43929b384 /bench/BlurBench.cpp | |
| parent | c29c76aae518a9c368248063e84a96ffe8c75b90 (diff) | |
hide SkBlurMaskFilter and SkBlurQuality
SK_SUPPORT_LEGACY_BLURMASKFILTER
Bug: skia:
Change-Id: Ic3e27e08e6e3cd2ffc1cd13b044e197bebc96236
Reviewed-on: https://skia-review.googlesource.com/113940
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'bench/BlurBench.cpp')
| -rw-r--r-- | bench/BlurBench.cpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/bench/BlurBench.cpp b/bench/BlurBench.cpp index 5b94d66ff6..ce801a0ddc 100644 --- a/bench/BlurBench.cpp +++ b/bench/BlurBench.cpp @@ -6,8 +6,8 @@ */ #include "Benchmark.h" #include "SkBlurMask.h" -#include "SkBlurMaskFilter.h" #include "SkCanvas.h" +#include "SkMaskFilter.h" #include "SkPaint.h" #include "SkRandom.h" #include "SkShader.h" @@ -31,17 +31,14 @@ static const char* gStyleName[] = { class BlurBench : public Benchmark { SkScalar fRadius; SkBlurStyle fStyle; - uint32_t fFlags; SkString fName; public: - BlurBench(SkScalar rad, SkBlurStyle bs, uint32_t flags = 0) { + BlurBench(SkScalar rad, SkBlurStyle bs) { fRadius = rad; fStyle = bs; - fFlags = flags; const char* name = rad > 0 ? gStyleName[bs] : "none"; - const char* quality = flags & SkBlurMaskFilter::kHighQuality_BlurFlag ? "high_quality" - : "low_quality"; + const char* quality = "high_quality"; if (SkScalarFraction(rad) != 0) { fName.printf("blur_%.2f_%s_%s", SkScalarToFloat(rad), name, quality); } else { @@ -67,9 +64,8 @@ protected: r.offset(fRadius, fRadius); if (fRadius > 0) { - paint.setMaskFilter(SkBlurMaskFilter::Make(fStyle, - SkBlurMask::ConvertRadiusToSigma(fRadius), - fFlags)); + paint.setMaskFilter(SkMaskFilter::MakeBlur(fStyle, + SkBlurMask::ConvertRadiusToSigma(fRadius))); } canvas->drawOval(r, paint); } @@ -104,15 +100,4 @@ DEF_BENCH(return new BlurBench(REAL, kSolid_SkBlurStyle);) DEF_BENCH(return new BlurBench(REAL, kOuter_SkBlurStyle);) DEF_BENCH(return new BlurBench(REAL, kInner_SkBlurStyle);) -DEF_BENCH(return new BlurBench(MINI, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) - -DEF_BENCH(return new BlurBench(SMALL, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) - -DEF_BENCH(return new BlurBench(BIG, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) - -DEF_BENCH(return new BlurBench(REALBIG, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) - -DEF_BENCH(return new BlurBench(REAL, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) -DEF_BENCH(return new BlurBench(CUTOVER, kNormal_SkBlurStyle, SkBlurMaskFilter::kHighQuality_BlurFlag);) - DEF_BENCH(return new BlurBench(0, kNormal_SkBlurStyle);) |