diff options
Diffstat (limited to 'gm/blurs.cpp')
-rw-r--r-- | gm/blurs.cpp | 69 |
1 files changed, 30 insertions, 39 deletions
diff --git a/gm/blurs.cpp b/gm/blurs.cpp index 0e0374e0a5..1ba13691e2 100644 --- a/gm/blurs.cpp +++ b/gm/blurs.cpp @@ -9,8 +9,8 @@ #include "sk_tool_utils.h" #include "Resources.h" #include "SkBlurMask.h" -#include "SkBlurMaskFilter.h" #include "SkImage.h" +#include "SkMaskFilter.h" #include "SkPath.h" DEF_SIMPLE_GM_BG(blurs, canvas, 700, 500, sk_tool_utils::color_to_565(0xFFDDDDDD)) { @@ -32,43 +32,34 @@ DEF_SIMPLE_GM_BG(blurs, canvas, 700, 500, sk_tool_utils::color_to_565(0xFFDDDDDD paint.setTextSize(SkIntToScalar(25)); canvas->translate(SkIntToScalar(-40), SkIntToScalar(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(SkIntToScalar(200 + gRecs[i].fCx*100), - SkIntToScalar(200 + gRecs[i].fCy*100), - SkIntToScalar(50), - paint); - } - // draw text - { - paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(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(SkIntToScalar(350), SkIntToScalar(0)); + canvas->drawCircle(SkIntToScalar(200 + gRecs[i].fCx*100), + SkIntToScalar(200 + gRecs[i].fCy*100), + SkIntToScalar(50), + paint); + } + // draw text + { + paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(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); } } @@ -83,7 +74,7 @@ DEF_SIMPLE_GM_BG(blurs, canvas, 700, 500, sk_tool_utils::color_to_565(0xFFDDDDDD DEF_SIMPLE_GM(blur2rects, canvas, 700, 500) { SkPaint paint; - paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, 2.3f)); + paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, 2.3f)); SkRect outer = SkRect::MakeXYWH(10.125f, 10.125f, 100.125f, 100); SkRect inner = SkRect::MakeXYWH(20.25f, 20.125f, 80, 80); @@ -101,7 +92,7 @@ DEF_SIMPLE_GM(blur2rects, canvas, 700, 500) { DEF_SIMPLE_GM(blur2rectsnonninepatch, canvas, 700, 500) { SkPaint paint; - paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, 4.3f)); + paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, 4.3f)); SkRect outer = SkRect::MakeXYWH(10, 110, 100, 100); SkRect inner = SkRect::MakeXYWH(50, 150, 10, 10); @@ -122,7 +113,7 @@ DEF_SIMPLE_GM(blur2rectsnonninepatch, canvas, 700, 500) { DEF_SIMPLE_GM(BlurDrawImage, canvas, 256, 256) { SkPaint paint; - paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, 10, 0)); + paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, 10)); canvas->clear(0xFF88FF88); if (auto image = GetResourceAsImage("images/mandrill_512_q075.jpg")) { canvas->scale(0.25, 0.25); |