From 1be1f8d097da4d4c07b4a1fa16013b0d440e4308 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 14 Mar 2018 13:01:17 -0400 Subject: 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 Reviewed-by: Florin Malita --- bench/BlurBench.cpp | 25 +++++-------------------- bench/BlurOccludedRRectBench.cpp | 6 +++--- bench/BlurRectBench.cpp | 2 +- bench/BlurRectsBench.cpp | 4 ++-- bench/BlurRoundRectBench.cpp | 7 +++---- bench/RectoriBench.cpp | 5 ++--- 6 files changed, 16 insertions(+), 33 deletions(-) (limited to 'bench') 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);) diff --git a/bench/BlurOccludedRRectBench.cpp b/bench/BlurOccludedRRectBench.cpp index 2de50c509a..b5635c5ad8 100644 --- a/bench/BlurOccludedRRectBench.cpp +++ b/bench/BlurOccludedRRectBench.cpp @@ -6,8 +6,8 @@ */ #include "Benchmark.h" -#include "SkBlurMaskFilter.h" #include "SkCanvas.h" +#include "SkMaskFilter.h" #include "SkPaint.h" #include "SkRRect.h" #include "SkRect.h" @@ -48,7 +48,7 @@ public: SkPaint firstBlur; firstBlur.setAntiAlias(true); firstBlur.setColor(0x09000000); - firstBlur.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, + firstBlur.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, 2.5f, occRect)); @@ -60,7 +60,7 @@ public: SkPaint secondBlur; secondBlur.setAntiAlias(true); secondBlur.setColor(0x30000000); - secondBlur.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, + secondBlur.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, 6.0f, occRect)); diff --git a/bench/BlurRectBench.cpp b/bench/BlurRectBench.cpp index 163130201e..3449ffabed 100644 --- a/bench/BlurRectBench.cpp +++ b/bench/BlurRectBench.cpp @@ -145,7 +145,7 @@ protected: void makeBlurryRect(const SkRect&) override { SkMask mask; if (!SkBlurMask::BoxBlur(&mask, fSrcMask, SkBlurMask::ConvertRadiusToSigma(this->radius()), - kNormal_SkBlurStyle, kHigh_SkBlurQuality)) { + kNormal_SkBlurStyle)) { return; } SkMask::FreeImage(mask.fImage); diff --git a/bench/BlurRectsBench.cpp b/bench/BlurRectsBench.cpp index fc04d0294e..d41ee1aafa 100644 --- a/bench/BlurRectsBench.cpp +++ b/bench/BlurRectsBench.cpp @@ -6,8 +6,8 @@ */ #include "Benchmark.h" -#include "SkBlurMaskFilter.h" #include "SkCanvas.h" +#include "SkMaskFilter.h" #include "SkPaint.h" #include "SkPath.h" #include "SkRect.h" @@ -31,7 +31,7 @@ public: void onDraw(int loops, SkCanvas* canvas) override { SkPaint paint; - paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, fRadius)); + paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, fRadius)); SkPath path; path.addRect(fOuter, SkPath::kCW_Direction); diff --git a/bench/BlurRoundRectBench.cpp b/bench/BlurRoundRectBench.cpp index 6ebc641fd9..085a8eb0e6 100644 --- a/bench/BlurRoundRectBench.cpp +++ b/bench/BlurRoundRectBench.cpp @@ -7,10 +7,10 @@ #include "Benchmark.h" #include "SkBlurMask.h" -#include "SkBlurMaskFilter.h" #include "SkCanvas.h" #include "SkColorFilter.h" #include "SkLayerDrawLooper.h" +#include "SkMaskFilter.h" #include "SkPaint.h" #include "SkPath.h" #include "SkPoint.h" @@ -48,9 +48,8 @@ public: info.fOffset = SkPoint::Make(SkIntToScalar(-1), SkIntToScalar(0)); info.fPostTranslate = false; SkPaint* paint = looperBuilder.addLayerOnTop(info); - paint->setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, - SkBlurMask::ConvertRadiusToSigma(0.5), - SkBlurMaskFilter::kHighQuality_BlurFlag)); + paint->setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, + SkBlurMask::ConvertRadiusToSigma(0.5))); paint->setColorFilter(SkColorFilter::MakeModeFilter(SK_ColorLTGRAY, SkBlendMode::kSrcIn)); paint->setColor(SK_ColorGRAY); diff --git a/bench/RectoriBench.cpp b/bench/RectoriBench.cpp index 416f9ea2ba..c0d21552f9 100644 --- a/bench/RectoriBench.cpp +++ b/bench/RectoriBench.cpp @@ -6,9 +6,9 @@ */ #include "Benchmark.h" -#include "SkBlurMaskFilter.h" #include "SkCanvas.h" #include "SkLayerDrawLooper.h" +#include "SkMaskFilter.h" #include "SkPaint.h" #include "SkPath.h" #include "SkRandom.h" @@ -86,8 +86,7 @@ private: SkPaint* paint = looperBuilder.addLayer(info); - paint->setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, sigma, - SkBlurMaskFilter::kHighQuality_BlurFlag)); + paint->setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, sigma)); //----------------------------------------------- info.fPaintBits = 0; -- cgit v1.2.3