From 9ce9d6772df650ceb0511f275e1a83dffa78ff72 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 17 Mar 2016 10:51:11 -0700 Subject: 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 --- gm/mipmap.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gm/mipmap.cpp') diff --git a/gm/mipmap.cpp b/gm/mipmap.cpp index b0b0cc487c..4b1912a99c 100644 --- a/gm/mipmap.cpp +++ b/gm/mipmap.cpp @@ -11,7 +11,7 @@ #include "SkRandom.h" #include "SkSurface.h" -static SkImage* make_image() { +static sk_sp make_image() { const SkImageInfo info = SkImageInfo::MakeN32Premul(319, 52); SkAutoTUnref surface(SkSurface::NewRaster(info)); SkCanvas* canvas = surface->getCanvas(); @@ -25,11 +25,11 @@ static SkImage* make_image() { canvas->drawCircle(-4, 25, 20, paint); canvas->translate(25, 0); } - return surface->newImageSnapshot(); + return surface->makeImageSnapshot(); } DEF_SIMPLE_GM(mipmap, canvas, 400, 200) { - SkAutoTUnref img(make_image());//SkImage::NewFromEncoded(data)); + sk_sp img(make_image());//SkImage::NewFromEncoded(data)); SkPaint paint; const SkRect dst = SkRect::MakeWH(177, 15); @@ -42,9 +42,9 @@ DEF_SIMPLE_GM(mipmap, canvas, 400, 200) { canvas->translate(20, 20); for (int i = 0; i < 4; ++i) { paint.setFilterQuality(SkFilterQuality(i)); - canvas->drawImageRect(img, dst, &paint); + canvas->drawImageRect(img.get(), dst, &paint); canvas->translate(0, 20); } - canvas->drawImage(img, 20, 20, nullptr); + canvas->drawImage(img.get(), 20, 20, nullptr); } -- cgit v1.2.3