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 /samplecode | |
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 'samplecode')
-rw-r--r-- | samplecode/SampleAnimBlur.cpp | 7 | ||||
-rw-r--r-- | samplecode/SampleBigBlur.cpp | 7 | ||||
-rw-r--r-- | samplecode/SampleBlur.cpp | 57 | ||||
-rw-r--r-- | samplecode/SampleEffects.cpp | 3 | ||||
-rw-r--r-- | samplecode/SampleFilterFuzz.cpp | 9 | ||||
-rw-r--r-- | samplecode/SampleFuzz.cpp | 5 | ||||
-rw-r--r-- | samplecode/SampleStrokePath.cpp | 4 | ||||
-rw-r--r-- | samplecode/SampleTextAlpha.cpp | 5 | ||||
-rw-r--r-- | samplecode/SampleTextureDomain.cpp | 12 | ||||
-rw-r--r-- | samplecode/SampleXfermodesBlur.cpp | 5 |
10 files changed, 49 insertions, 65 deletions
diff --git a/samplecode/SampleAnimBlur.cpp b/samplecode/SampleAnimBlur.cpp index 5330fdfa71..bf5005dc18 100644 --- a/samplecode/SampleAnimBlur.cpp +++ b/samplecode/SampleAnimBlur.cpp @@ -7,9 +7,9 @@ #include "SampleCode.h" #include "SkAnimTimer.h" -#include "SkBlurMaskFilter.h" #include "SkColorPriv.h" #include "SkCanvas.h" +#include "SkMaskFilter.h" #include "SkRandom.h" SkScalar get_anim_sin(double secs, SkScalar amplitude, SkScalar periodInSec, SkScalar phaseInSec) { @@ -47,9 +47,8 @@ protected: for (size_t i = 0; i < SK_ARRAY_COUNT(gStyles); ++i) { SkPaint paint; - paint.setMaskFilter(SkBlurMaskFilter::Make(gStyles[i], - fBlurSigma, - SkBlurMaskFilter::kHighQuality_BlurFlag)); + paint.setMaskFilter(SkMaskFilter::MakeBlur(gStyles[i], + fBlurSigma)); paint.setColor(random.nextU() | 0xff000000); canvas->drawCircle(200 * SK_Scalar1 + 400 * (i % 2) * SK_Scalar1, 200 * SK_Scalar1 + i / 2 * 400 * SK_Scalar1, diff --git a/samplecode/SampleBigBlur.cpp b/samplecode/SampleBigBlur.cpp index cb7a419a80..03349833f9 100644 --- a/samplecode/SampleBigBlur.cpp +++ b/samplecode/SampleBigBlur.cpp @@ -6,8 +6,8 @@ */ #include "SampleCode.h" #include "SkBlurMask.h" -#include "SkBlurMaskFilter.h" #include "SkCanvas.h" +#include "SkMaskFilter.h" #include "SkView.h" class BigBlurView : public SampleView { @@ -29,10 +29,9 @@ protected: SkPaint paint; canvas->save(); paint.setColor(SK_ColorBLUE); - paint.setMaskFilter(SkBlurMaskFilter::Make( + paint.setMaskFilter(SkMaskFilter::MakeBlur( kNormal_SkBlurStyle, - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(128)), - SkBlurMaskFilter::kHighQuality_BlurFlag)); + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(128)))); canvas->translate(200, 200); canvas->drawCircle(100, 100, 200, paint); canvas->restore(); diff --git a/samplecode/SampleBlur.cpp b/samplecode/SampleBlur.cpp index a5e5a18cb9..5890ce62e8 100644 --- a/samplecode/SampleBlur.cpp +++ b/samplecode/SampleBlur.cpp @@ -8,10 +8,10 @@ #include "SampleCode.h" #include "SkBitmap.h" #include "SkBlurMask.h" -#include "SkBlurMaskFilter.h" #include "SkCanvas.h" #include "SkColorPriv.h" #include "SkGradientShader.h" +#include "SkMaskFilter.h" #include "SkUtils.h" #include "SkView.h" @@ -54,40 +54,31 @@ protected: paint.setTextSize(25); canvas->translate(-40, 0); - SkBlurMaskFilter::BlurFlags flags = SkBlurMaskFilter::kNone_BlurFlag; - for (int j = 0; j < 2; j++) { - canvas->save(); - paint.setColor(SK_ColorBLUE); - for (size_t i = 0; i < SK_ARRAY_COUNT(gRecs); i++) { - if (gRecs[i].fStyle != NONE) { - paint.setMaskFilter(SkBlurMaskFilter::Make(gRecs[i].fStyle, - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(20)), - flags)); - } else { - paint.setMaskFilter(nullptr); - } - canvas->drawCircle(200 + gRecs[i].fCx*100.f, - 200 + gRecs[i].fCy*100.f, 50, paint); - } - // draw text - { - paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, - SkBlurMask::ConvertRadiusToSigma(4), - flags)); - SkScalar x = SkIntToScalar(70); - SkScalar y = SkIntToScalar(400); - paint.setColor(SK_ColorBLACK); - canvas->drawString("Hamburgefons Style", x, y, paint); - canvas->drawString("Hamburgefons Style", x, y + SkIntToScalar(50), paint); + paint.setColor(SK_ColorBLUE); + for (size_t i = 0; i < SK_ARRAY_COUNT(gRecs); i++) { + if (gRecs[i].fStyle != NONE) { + paint.setMaskFilter(SkMaskFilter::MakeBlur(gRecs[i].fStyle, + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(20)))); + } else { paint.setMaskFilter(nullptr); - paint.setColor(SK_ColorWHITE); - x -= SkIntToScalar(2); - y -= SkIntToScalar(2); - canvas->drawString("Hamburgefons Style", x, y, paint); } - canvas->restore(); - flags = SkBlurMaskFilter::kHighQuality_BlurFlag; - canvas->translate(350, 0); + canvas->drawCircle(200 + gRecs[i].fCx*100.f, + 200 + gRecs[i].fCy*100.f, 50, paint); + } + // draw text + { + paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, + SkBlurMask::ConvertRadiusToSigma(4))); + SkScalar x = SkIntToScalar(70); + SkScalar y = SkIntToScalar(400); + paint.setColor(SK_ColorBLACK); + canvas->drawString("Hamburgefons Style", x, y, paint); + canvas->drawString("Hamburgefons Style", x, y + SkIntToScalar(50), paint); + paint.setMaskFilter(nullptr); + paint.setColor(SK_ColorWHITE); + x -= SkIntToScalar(2); + y -= SkIntToScalar(2); + canvas->drawString("Hamburgefons Style", x, y, paint); } } diff --git a/samplecode/SampleEffects.cpp b/samplecode/SampleEffects.cpp index 49654983da..d890232aaf 100644 --- a/samplecode/SampleEffects.cpp +++ b/samplecode/SampleEffects.cpp @@ -6,7 +6,6 @@ */ #include "SampleCode.h" #include "SkBlurMask.h" -#include "SkBlurMaskFilter.h" #include "SkCanvas.h" #include "SkColorMatrixFilter.h" #include "SkDiscretePathEffect.h" @@ -23,7 +22,7 @@ static void paint_proc0(SkPaint*) { } static void paint_proc1(SkPaint* paint) { - paint->setMaskFilter(SkBlurMaskFilter::Make( + paint->setMaskFilter(SkMaskFilter::MakeBlur( kNormal_SkBlurStyle, SkBlurMask::ConvertRadiusToSigma(2))); } diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 28ba1e69d6..f3710984ec 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -9,7 +9,6 @@ #include "Sk2DPathEffect.h" #include "SkAlphaThresholdFilter.h" #include "SkBlurImageFilter.h" -#include "SkBlurMaskFilter.h" #include "SkCanvas.h" #include "SkColorFilter.h" #include "SkColorFilterImageFilter.h" @@ -186,8 +185,8 @@ static SkBlurStyle make_blur_style() { return static_cast<SkBlurStyle>(R(kLastEnum_SkBlurStyle+1)); } -static SkBlurMaskFilter::BlurFlags make_blur_mask_filter_flag() { - return static_cast<SkBlurMaskFilter::BlurFlags>(R(SkBlurMaskFilter::kAll_BlurFlag+1)); +static bool make_blur_mask_filter_respectctm() { + return static_cast<bool>(R(2)); } static SkFilterQuality make_filter_quality() { @@ -458,8 +457,8 @@ static sk_sp<SkMaskFilter> make_mask_filter() { sk_sp<SkMaskFilter> maskFilter; switch (R(3)) { case 0: - maskFilter = SkBlurMaskFilter::Make(make_blur_style(), make_scalar(), - make_blur_mask_filter_flag()); + maskFilter = SkMaskFilter::MakeBlur(make_blur_style(), make_scalar(), + make_blur_mask_filter_respectctm()); case 1: { SkEmbossMaskFilter::Light light; for (int i = 0; i < 3; ++i) { diff --git a/samplecode/SampleFuzz.cpp b/samplecode/SampleFuzz.cpp index 63504cd77a..1379e73d13 100644 --- a/samplecode/SampleFuzz.cpp +++ b/samplecode/SampleFuzz.cpp @@ -4,10 +4,11 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + #include "SampleCode.h" #include "SkView.h" #include "SkCanvas.h" -#include "SkBlurMaskFilter.h" +#include "SkMaskFilter.h" #include "SkPaint.h" #include "SkPath.h" #include "SkMatrix.h" @@ -188,7 +189,7 @@ static void do_fuzz(SkCanvas* canvas) { case 7: if (quick == true) break; - paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, make_number())); + paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, make_number())); break; case 8: diff --git a/samplecode/SampleStrokePath.cpp b/samplecode/SampleStrokePath.cpp index ce64155504..d51f24f6fa 100644 --- a/samplecode/SampleStrokePath.cpp +++ b/samplecode/SampleStrokePath.cpp @@ -6,8 +6,8 @@ */ #include "SampleCode.h" #include "SkBlurMask.h" -#include "SkBlurMaskFilter.h" #include "SkCanvas.h" +#include "SkMaskFilter.h" #include "SkParsePath.h" #include "SkPath.h" #include "SkRandom.h" @@ -168,7 +168,7 @@ protected: SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(4)); for (int y = 0; y < 10; y++) { if (x) { - paint.setMaskFilter(SkBlurMaskFilter::Make(gStyle[x - 1], sigma)); + paint.setMaskFilter(SkMaskFilter::MakeBlur(gStyle[x - 1], sigma)); } canvas->drawString("Title Bar", x*SkIntToScalar(100), y*SkIntToScalar(30), paint); sigma *= 0.75f; diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp index 097af8fb4d..c6ef3d7124 100644 --- a/samplecode/SampleTextAlpha.cpp +++ b/samplecode/SampleTextAlpha.cpp @@ -4,12 +4,13 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + #include "SampleCode.h" #include "SkBlurMask.h" -#include "SkBlurMaskFilter.h" #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkGraphics.h" +#include "SkMaskFilter.h" #include "SkPath.h" #include "SkRandom.h" #include "SkRegion.h" @@ -50,7 +51,7 @@ protected: paint.setARGB(fByte, 0xFF, 0xFF, 0xFF); - paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, + paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, SkBlurMask::ConvertRadiusToSigma(3))); SkRandom rand; diff --git a/samplecode/SampleTextureDomain.cpp b/samplecode/SampleTextureDomain.cpp index 9c7f3de7a3..7b429cbe16 100644 --- a/samplecode/SampleTextureDomain.cpp +++ b/samplecode/SampleTextureDomain.cpp @@ -76,11 +76,8 @@ protected: // renders correctly srcRect.setXYWH(1, 1, 3, 3); dstRect.setXYWH(5, 405, 305, 305); - paint.setMaskFilter(SkBlurMaskFilter::Make( - kNormal_SkBlurStyle, - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)), - SkBlurMaskFilter::kHighQuality_BlurFlag | - SkBlurMaskFilter::kIgnoreTransform_BlurFlag)); + paint.setMaskFilter(SkMaskFilter::MakeBlur( + kNormal_SkBlurStyle, SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5)), false)); canvas->drawImageRect(image, srcRect, dstRect, &paint); // Blur and a rotation + nullptr src rect @@ -88,9 +85,8 @@ protected: // but it will test a code path in SkGpuDevice::drawBitmap // that handles blurs with rects transformed to non- // orthogonal rects. It also tests the nullptr src rect handling - paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, - SkBlurMask::ConvertRadiusToSigma(5), - SkBlurMaskFilter::kHighQuality_BlurFlag)); + paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, + SkBlurMask::ConvertRadiusToSigma(5))); dstRect.setXYWH(-150, -150, 300, 300); canvas->translate(550, 550); diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp index ec478dbcac..37b859288b 100644 --- a/samplecode/SampleXfermodesBlur.cpp +++ b/samplecode/SampleXfermodesBlur.cpp @@ -39,9 +39,8 @@ class XfermodesBlurView : public SampleView { void draw_mode(SkCanvas* canvas, SkBlendMode mode, int alpha, SkScalar x, SkScalar y) { SkPaint p; - p.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, - SkBlurMask::ConvertRadiusToSigma(5), - SkBlurMaskFilter::kNone_BlurFlag)); + p.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, + SkBlurMask::ConvertRadiusToSigma(5))); SkScalar ww = SkIntToScalar(W); SkScalar hh = SkIntToScalar(H); |