diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-01 09:28:51 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-01 09:28:51 -0700 |
| commit | 549c8991959333e5c0f53faebcbbd5d6bc8f6a56 (patch) | |
| tree | db498c61ef16f570f8c43b5c7bf462529134704a /bench | |
| parent | f27002947d40ab884e13d39ee2ef0ac4ccadcd6a (diff) | |
Update SkImageSource to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842243002
Review URL: https://codereview.chromium.org/1842243002
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/DisplacementBench.cpp | 12 | ||||
| -rw-r--r-- | bench/MergeBench.cpp | 5 |
2 files changed, 8 insertions, 9 deletions
diff --git a/bench/DisplacementBench.cpp b/bench/DisplacementBench.cpp index eadafb6622..82857e630f 100644 --- a/bench/DisplacementBench.cpp +++ b/bench/DisplacementBench.cpp @@ -102,11 +102,11 @@ protected: void onDraw(int loops, SkCanvas* canvas) override { SkPaint paint; - SkAutoTUnref<SkImageFilter> displ(SkImageSource::Create(fCheckerboard.get())); + sk_sp<SkImageFilter> displ(SkImageSource::Make(fCheckerboard)); // No displacement effect paint.setImageFilter(SkDisplacementMapEffect::Create( SkDisplacementMapEffect::kR_ChannelSelectorType, - SkDisplacementMapEffect::kG_ChannelSelectorType, 0.0f, displ))->unref(); + SkDisplacementMapEffect::kG_ChannelSelectorType, 0.0f, displ.get()))->unref(); for (int i = 0; i < loops; i++) { this->drawClippedBitmap(canvas, 0, 0, paint); @@ -129,11 +129,11 @@ protected: void onDraw(int loops, SkCanvas* canvas) override { SkPaint paint; - SkAutoTUnref<SkImageFilter> displ(SkImageSource::Create(fCheckerboard.get())); + sk_sp<SkImageFilter> displ(SkImageSource::Make(fCheckerboard)); // Displacement, with 1 alpha component (which isn't pre-multiplied) paint.setImageFilter(SkDisplacementMapEffect::Create( SkDisplacementMapEffect::kB_ChannelSelectorType, - SkDisplacementMapEffect::kA_ChannelSelectorType, 16.0f, displ))->unref(); + SkDisplacementMapEffect::kA_ChannelSelectorType, 16.0f, displ.get()))->unref(); for (int i = 0; i < loops; i++) { drawClippedBitmap(canvas, 100, 0, paint); } @@ -155,11 +155,11 @@ protected: void onDraw(int loops, SkCanvas* canvas) override { SkPaint paint; - SkAutoTUnref<SkImageFilter> displ(SkImageSource::Create(fCheckerboard.get())); + sk_sp<SkImageFilter> displ(SkImageSource::Make(fCheckerboard)); // Displacement, with 2 non-alpha components paint.setImageFilter(SkDisplacementMapEffect::Create( SkDisplacementMapEffect::kR_ChannelSelectorType, - SkDisplacementMapEffect::kB_ChannelSelectorType, 32.0f, displ))->unref(); + SkDisplacementMapEffect::kB_ChannelSelectorType, 32.0f, displ.get()))->unref(); for (int i = 0; i < loops; ++i) { this->drawClippedBitmap(canvas, 200, 0, paint); } diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp index 061a4d36f3..70b4744784 100644 --- a/bench/MergeBench.cpp +++ b/bench/MergeBench.cpp @@ -80,9 +80,8 @@ protected: private: sk_sp<SkImageFilter> mergeBitmaps() { - sk_sp<SkImageFilter> first(SkImageSource::Create(fCheckerboard.get())); - sk_sp<SkImageFilter> second(SkImageSource::Create(fImage.get())); - return SkMergeImageFilter::Make(std::move(first), std::move(second)); + return SkMergeImageFilter::Make(SkImageSource::Make(fCheckerboard), + SkImageSource::Make(fImage)); } bool fIsSmall; |