diff options
| author |  reed <reed@google.com> | 2016-04-04 10:02:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-04 10:02:58 -0700 |
| commit | efdfd51b68a300d5c6e28743fe0344ca05d1cec9 (patch) | |
| tree | 3cd04d31a56219559e89f6eded6f7a894eb700ba /gm/blurs.cpp | |
| parent | 175cf0e51b9fbb075588c4d29e7e4257cea6f4ad (diff) | |
switch maskfilters to sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852113003
Review URL: https://codereview.chromium.org/1852113003
Diffstat (limited to 'gm/blurs.cpp')
| -rw-r--r-- | gm/blurs.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/gm/blurs.cpp b/gm/blurs.cpp index 8f2137eeab..8fa97b886b 100644 --- a/gm/blurs.cpp +++ b/gm/blurs.cpp @@ -35,10 +35,9 @@ DEF_SIMPLE_GM_BG(blurs, canvas, 700, 500, sk_tool_utils::color_to_565(0xFFDDDDDD paint.setColor(SK_ColorBLUE); for (size_t i = 0; i < SK_ARRAY_COUNT(gRecs); i++) { if (gRecs[i].fStyle != NONE) { - SkMaskFilter* mf = SkBlurMaskFilter::Create(gRecs[i].fStyle, + paint.setMaskFilter(SkBlurMaskFilter::Make(gRecs[i].fStyle, SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(20)), - flags); - paint.setMaskFilter(mf)->unref(); + flags)); } else { paint.setMaskFilter(nullptr); } @@ -49,10 +48,9 @@ DEF_SIMPLE_GM_BG(blurs, canvas, 700, 500, sk_tool_utils::color_to_565(0xFFDDDDDD } // draw text { - SkMaskFilter* mf = SkBlurMaskFilter::Create(kNormal_SkBlurStyle, + paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(4)), - flags); - paint.setMaskFilter(mf)->unref(); + flags)); SkScalar x = SkIntToScalar(70); SkScalar y = SkIntToScalar(400); paint.setColor(SK_ColorBLACK); @@ -82,8 +80,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::Create(kNormal_SkBlurStyle, - 2.3f))->unref(); + paint.setMaskFilter(SkBlurMaskFilter::Make(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,8 +98,7 @@ DEF_SIMPLE_GM(blur2rects, canvas, 700, 500) { DEF_SIMPLE_GM(blur2rectsnonninepatch, canvas, 700, 500) { SkPaint paint; - paint.setMaskFilter(SkBlurMaskFilter::Create(kNormal_SkBlurStyle, - 4.3f))->unref(); + paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, 4.3f)); SkRect outer = SkRect::MakeXYWH(10, 110, 100, 100); SkRect inner = SkRect::MakeXYWH(50, 150, 10, 10); |