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/drawatlas.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/drawatlas.cpp')
| -rw-r--r-- | gm/drawatlas.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/drawatlas.cpp b/gm/drawatlas.cpp index 858e4bf056..4d2f6d46f3 100644 --- a/gm/drawatlas.cpp +++ b/gm/drawatlas.cpp @@ -11,7 +11,7 @@ #include "SkSurface.h" class DrawAtlasGM : public skiagm::GM { - static SkImage* MakeAtlas(SkCanvas* caller, const SkRect& target) { + static sk_sp<SkImage> MakeAtlas(SkCanvas* caller, const SkRect& target) { SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100); SkAutoTUnref<SkSurface> surface(caller->newSurface(info)); if (nullptr == surface) { @@ -32,10 +32,10 @@ class DrawAtlasGM : public skiagm::GM { paint.setColor(SK_ColorBLUE); paint.setAntiAlias(true); canvas->drawOval(target, paint); - return surface->newImageSnapshot(); + return surface->makeImageSnapshot(); } - SkAutoTUnref<SkImage> fAtlas; + sk_sp<SkImage> fAtlas; public: DrawAtlasGM() {} @@ -53,7 +53,7 @@ protected: void onDraw(SkCanvas* canvas) override { const SkRect target = { 50, 50, 80, 90 }; if (nullptr == fAtlas) { - fAtlas.reset(MakeAtlas(canvas, target)); + fAtlas = MakeAtlas(canvas, target); } const struct { @@ -91,9 +91,9 @@ protected: paint.setFilterQuality(kLow_SkFilterQuality); paint.setAntiAlias(true); - canvas->drawAtlas(fAtlas, xform, tex, N, nullptr, &paint); + canvas->drawAtlas(fAtlas.get(), xform, tex, N, nullptr, &paint); canvas->translate(0, 100); - canvas->drawAtlas(fAtlas, xform, tex, colors, N, SkXfermode::kSrcIn_Mode, nullptr, &paint); + canvas->drawAtlas(fAtlas.get(), xform, tex, colors, N, SkXfermode::kSrcIn_Mode, nullptr, &paint); } private: |