diff options
author | robertphillips <robertphillips@google.com> | 2016-04-04 04:31:25 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-04 04:31:25 -0700 |
commit | 6e7025ab13dfc4f0037233e67b4b8e18d6dfd1e1 (patch) | |
tree | ad46002c401ef4bd42ac963a1f8eed09beeb90b3 /gm/spritebitmap.cpp | |
parent | 60c9b58b3214b0154c931656e91e39b230e987d8 (diff) |
Update SkBlurImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852743002
Review URL: https://codereview.chromium.org/1852743002
Diffstat (limited to 'gm/spritebitmap.cpp')
-rw-r--r-- | gm/spritebitmap.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/spritebitmap.cpp b/gm/spritebitmap.cpp index 6c438fad11..38fe9f4302 100644 --- a/gm/spritebitmap.cpp +++ b/gm/spritebitmap.cpp @@ -23,7 +23,7 @@ static void make_bm(SkBitmap* bm) { } static void draw_1_bitmap(SkCanvas* canvas, const SkBitmap& bm, bool doClip, - int dx, int dy, SkImageFilter* filter = nullptr) { + int dx, int dy, sk_sp<SkImageFilter> filter) { SkAutoCanvasRestore acr(canvas, true); SkPaint paint; @@ -32,7 +32,7 @@ static void draw_1_bitmap(SkCanvas* canvas, const SkBitmap& bm, bool doClip, SkIntToScalar(bm.width()), SkIntToScalar(bm.height())); - paint.setImageFilter(filter); + paint.setImageFilter(std::move(filter)); clipR.inset(5, 5); canvas->translate(SkIntToScalar(bm.width() + 20), 0); @@ -72,13 +72,13 @@ protected: int dy = 10; SkScalar sigma = 8; - SkAutoTUnref<SkImageFilter> filter(SkBlurImageFilter::Create(sigma, sigma)); + sk_sp<SkImageFilter> filter(SkBlurImageFilter::Make(sigma, sigma, nullptr)); - draw_1_bitmap(canvas, bm, false, dx, dy); + draw_1_bitmap(canvas, bm, false, dx, dy, nullptr); dy += bm.height() + 20; draw_1_bitmap(canvas, bm, false, dx, dy, filter); dy += bm.height() + 20; - draw_1_bitmap(canvas, bm, true, dx, dy); + draw_1_bitmap(canvas, bm, true, dx, dy, nullptr); dy += bm.height() + 20; draw_1_bitmap(canvas, bm, true, dx, dy, filter); } |