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 /bench/MergeBench.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 'bench/MergeBench.cpp')
-rw-r--r-- | bench/MergeBench.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp index 925b6b2bfe..b24f988ded 100644 --- a/bench/MergeBench.cpp +++ b/bench/MergeBench.cpp @@ -45,8 +45,8 @@ protected: private: SkImageFilter* mergeBitmaps() { - SkAutoTUnref<SkImageFilter> first(SkImageSource::Create(fCheckerboard)); - SkAutoTUnref<SkImageFilter> second(SkImageSource::Create(fImage)); + SkAutoTUnref<SkImageFilter> first(SkImageSource::Create(fCheckerboard.get())); + SkAutoTUnref<SkImageFilter> second(SkImageSource::Create(fImage.get())); return SkMergeImageFilter::Create(first, second); } @@ -59,7 +59,7 @@ private: paint.setTextSize(SkIntToScalar(96)); const char* str = "g"; surface->getCanvas()->drawText(str, strlen(str), 15, 55, paint); - fImage.reset(surface->newImageSnapshot()); + fImage = surface->makeImageSnapshot(); } void make_checkerboard() { @@ -82,12 +82,12 @@ private: } } - fCheckerboard.reset(surface->newImageSnapshot()); + fCheckerboard = surface->makeImageSnapshot(); } bool fIsSmall; bool fInitialized; - SkAutoTUnref<SkImage> fImage, fCheckerboard; + sk_sp<SkImage> fImage, fCheckerboard; typedef Benchmark INHERITED; }; |