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 /samplecode/SampleShip.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 'samplecode/SampleShip.cpp')
| -rw-r--r-- | samplecode/SampleShip.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SampleShip.cpp b/samplecode/SampleShip.cpp index fddf0235ba..daaf5e3551 100644 --- a/samplecode/SampleShip.cpp +++ b/samplecode/SampleShip.cpp @@ -48,10 +48,10 @@ static void draw_atlas_sim(SkCanvas* canvas, SkImage* atlas, const SkRSXform xfo class DrawShipView : public SampleView { public: DrawShipView(const char name[], DrawAtlasProc proc) : fName(name), fProc(proc) { - fAtlas.reset(GetResourceAsImage("ship.png")); + fAtlas = GetResourceAsImage("ship.png"); if (!fAtlas) { SkDebugf("\nCould not decode file ship.png. Falling back to penguin mode.\n"); - fAtlas.reset(GetResourceAsImage("baby_tux.png")); + fAtlas = GetResourceAsImage("baby_tux.png"); if (!fAtlas) { SkDebugf("\nCould not decode file baby_tux.png. Did you forget" " to set the resourcePath?\n"); @@ -146,7 +146,7 @@ protected: fXform[i].fTy += dy; } - fProc(canvas, fAtlas, fXform, fTex, nullptr, kGrid*kGrid+1, nullptr, &paint); + fProc(canvas, fAtlas.get(), fXform, fTex, nullptr, kGrid*kGrid+1, nullptr, &paint); paint.setColor(SK_ColorBLACK); canvas->drawRect(SkRect::MakeXYWH(0, 0, 200, 24), paint); paint.setColor(SK_ColorWHITE); @@ -168,7 +168,7 @@ private: const char* fName; DrawAtlasProc fProc; - SkAutoTUnref<SkImage> fAtlas; + sk_sp<SkImage> fAtlas; SkRSXform fXform[kGrid*kGrid+1]; SkRect fTex[kGrid*kGrid+1]; WallTimer fTimer; |