diff options
author | reed <reed@google.com> | 2016-03-17 10:51:11 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 10:51:11 -0700 |
commit | 9ce9d6772df650ceb0511f275e1a83dffa78ff72 (patch) | |
tree | 1c0d54a75945863947490ec45cccf7c30eaa2ca4 /gm/imagefilters.cpp | |
parent | 42d95a0afb26560586232961445ba36de387ca37 (diff) |
update callsites for Make image factories
not forced yet, as we still have the build-guard. waiting on chrome CL
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810813003
TBR=
Review URL: https://codereview.chromium.org/1810813003
Diffstat (limited to 'gm/imagefilters.cpp')
-rw-r--r-- | gm/imagefilters.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/imagefilters.cpp b/gm/imagefilters.cpp index 951a934d82..24a08ff865 100644 --- a/gm/imagefilters.cpp +++ b/gm/imagefilters.cpp @@ -66,14 +66,14 @@ DEF_SIMPLE_GM(imagefilters_xfermodes, canvas, 480, 480) { } } -static SkImage* make_image(SkCanvas* canvas) { +static sk_sp<SkImage> make_image(SkCanvas* canvas) { const SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100); SkAutoTUnref<SkSurface> surface(canvas->newSurface(info)); if (!surface) { surface.reset(SkSurface::NewRaster(info)); } surface->getCanvas()->drawRect(SkRect::MakeXYWH(25, 25, 50, 50), SkPaint()); - return surface->newImageSnapshot(); + return surface->makeImageSnapshot(); } // Compare blurs when we're tightly clipped (fast) and not as tightly (slower) @@ -81,7 +81,7 @@ static SkImage* make_image(SkCanvas* canvas) { // Expect the two to draw the same (modulo the extra border of pixels when the clip is larger) // DEF_SIMPLE_GM(fast_slow_blurimagefilter, canvas, 620, 260) { - SkAutoTUnref<SkImage> image(make_image(canvas)); + sk_sp<SkImage> image(make_image(canvas)); const SkRect r = SkRect::MakeIWH(image->width(), image->height()); canvas->translate(10, 10); @@ -162,7 +162,7 @@ DEF_SIMPLE_GM(savelayer_with_backdrop, canvas, 830, 550) { SkPaint paint; paint.setFilterQuality(kMedium_SkFilterQuality); - SkAutoTUnref<SkImage> image(GetResourceAsImage("mandrill_512.png")); + sk_sp<SkImage> image(GetResourceAsImage("mandrill_512.png")); canvas->translate(20, 20); for (const auto& xform : xforms) { |