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/image_shader.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/image_shader.cpp')
-rw-r--r-- | gm/image_shader.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gm/image_shader.cpp b/gm/image_shader.cpp index 7ea0202296..e7378c4470 100644 --- a/gm/image_shader.cpp +++ b/gm/image_shader.cpp @@ -24,16 +24,16 @@ static void draw_something(SkCanvas* canvas, const SkRect& bounds) { canvas->drawOval(bounds, paint); } -typedef SkImage* (*ImageMakerProc)(GrContext*, const SkPicture*, const SkImageInfo&); +typedef sk_sp<SkImage> (*ImageMakerProc)(GrContext*, SkPicture*, const SkImageInfo&); -static SkImage* make_raster(GrContext*, const SkPicture* pic, const SkImageInfo& info) { +static sk_sp<SkImage> make_raster(GrContext*, SkPicture* pic, const SkImageInfo& info) { SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info)); surface->getCanvas()->clear(0); surface->getCanvas()->drawPicture(pic); - return surface->newImageSnapshot(); + return surface->makeImageSnapshot(); } -static SkImage* make_texture(GrContext* ctx, const SkPicture* pic, const SkImageInfo& info) { +static sk_sp<SkImage> make_texture(GrContext* ctx, SkPicture* pic, const SkImageInfo& info) { if (!ctx) { return nullptr; } @@ -41,23 +41,23 @@ static SkImage* make_texture(GrContext* ctx, const SkPicture* pic, const SkImage info, 0)); surface->getCanvas()->clear(0); surface->getCanvas()->drawPicture(pic); - return surface->newImageSnapshot(); + return surface->makeImageSnapshot(); } -static SkImage* make_pict_gen(GrContext*, const SkPicture* pic, const SkImageInfo& info) { - return SkImage::NewFromPicture(pic, info.dimensions(), nullptr, nullptr); +static sk_sp<SkImage> make_pict_gen(GrContext*, SkPicture* pic, const SkImageInfo& info) { + return SkImage::MakeFromPicture(sk_ref_sp(pic), info.dimensions(), nullptr, nullptr); } -static SkImage* make_encode_gen(GrContext* ctx, const SkPicture* pic, const SkImageInfo& info) { - SkAutoTUnref<SkImage> src(make_raster(ctx, pic, info)); +static sk_sp<SkImage> make_encode_gen(GrContext* ctx, SkPicture* pic, const SkImageInfo& info) { + sk_sp<SkImage> src(make_raster(ctx, pic, info)); if (!src) { return nullptr; } - SkAutoTUnref<SkData> encoded(src->encode(SkImageEncoder::kPNG_Type, 100)); + sk_sp<SkData> encoded(src->encode(SkImageEncoder::kPNG_Type, 100)); if (!encoded) { return nullptr; } - return SkImage::NewFromEncoded(encoded); + return SkImage::MakeFromEncoded(std::move(encoded)); } const ImageMakerProc gProcs[] = { @@ -113,9 +113,9 @@ protected: const SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100); for (size_t i = 0; i < SK_ARRAY_COUNT(gProcs); ++i) { - SkAutoTUnref<SkImage> image(gProcs[i](canvas->getGrContext(), fPicture, info)); + sk_sp<SkImage> image(gProcs[i](canvas->getGrContext(), fPicture, info)); if (image) { - this->testImage(canvas, image); + this->testImage(canvas, image.get()); } canvas->translate(120, 0); } |