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/localmatriximagefilter.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/localmatriximagefilter.cpp')
-rw-r--r-- | gm/localmatriximagefilter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/localmatriximagefilter.cpp b/gm/localmatriximagefilter.cpp index 64ed6d7b8c..f99655863e 100644 --- a/gm/localmatriximagefilter.cpp +++ b/gm/localmatriximagefilter.cpp @@ -14,7 +14,7 @@ #include "SkOffsetImageFilter.h" #include "SkSurface.h" -static SkImage* make_image(SkCanvas* rootCanvas) { +static sk_sp<SkImage> make_image(SkCanvas* rootCanvas) { SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100); SkAutoTUnref<SkSurface> surface(rootCanvas->newSurface(info)); if (!surface) { @@ -25,7 +25,7 @@ static SkImage* make_image(SkCanvas* rootCanvas) { paint.setAntiAlias(true); paint.setColor(SK_ColorRED); surface->getCanvas()->drawCircle(50, 50, 50, paint); - return surface->newImageSnapshot(); + return surface->makeImageSnapshot(); } typedef SkImageFilter* (*ImageFilterFactory)(); @@ -62,7 +62,7 @@ protected: } void onDraw(SkCanvas* canvas) override { - SkAutoTUnref<SkImage> image0(make_image(canvas)); + sk_sp<SkImage> image0(make_image(canvas)); const ImageFilterFactory factories[] = { IFCCast([]{ return SkBlurImageFilter::Create(8, 8); }), @@ -84,11 +84,11 @@ protected: SkAutoTUnref<SkImageFilter> filter(factory()); canvas->save(); - show_image(canvas, image0, filter); + show_image(canvas, image0.get(), filter); for (const auto& matrix : matrices) { SkAutoTUnref<SkImageFilter> localFilter(filter->newWithLocalMatrix(matrix)); canvas->translate(spacer, 0); - show_image(canvas, image0, localFilter); + show_image(canvas, image0.get(), localFilter); } canvas->restore(); canvas->translate(0, spacer); |