diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-15 07:57:40 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-15 07:57:40 -0700 |
| commit | 534c270465a9824893d5c9d6c5bacef7726cc389 (patch) | |
| tree | 8d189a3c806f2fc2232cd6bea5bc344cd9b53c3f /src/effects/SkTileImageFilter.cpp | |
| parent | bfe11fc9a6e660f83a454b6a5f5945089a4800f3 (diff) | |
Update TileImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1882113002
Review URL: https://codereview.chromium.org/1882113002
Diffstat (limited to 'src/effects/SkTileImageFilter.cpp')
| -rw-r--r-- | src/effects/SkTileImageFilter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/effects/SkTileImageFilter.cpp b/src/effects/SkTileImageFilter.cpp index 9711eedfd5..c098bc2955 100644 --- a/src/effects/SkTileImageFilter.cpp +++ b/src/effects/SkTileImageFilter.cpp @@ -20,23 +20,23 @@ #include "SkValidationUtils.h" #include "SkWriteBuffer.h" -SkImageFilter* SkTileImageFilter::Create(const SkRect& srcRect, const SkRect& dstRect, - SkImageFilter* input) { +sk_sp<SkImageFilter> SkTileImageFilter::Make(const SkRect& srcRect, const SkRect& dstRect, + sk_sp<SkImageFilter> input) { if (!SkIsValidRect(srcRect) || !SkIsValidRect(dstRect)) { return nullptr; } if (srcRect.width() == dstRect.width() && srcRect.height() == dstRect.height()) { SkRect ir = dstRect; if (!ir.intersect(srcRect)) { - return SkSafeRef(input); + return input; } CropRect cropRect(ir); return SkOffsetImageFilter::Make(dstRect.x() - srcRect.x(), dstRect.y() - srcRect.y(), - sk_ref_sp<SkImageFilter>(input), - &cropRect).release(); + std::move(input), + &cropRect); } - return new SkTileImageFilter(srcRect, dstRect, input); + return sk_sp<SkImageFilter>(new SkTileImageFilter(srcRect, dstRect, std::move(input))); } sk_sp<SkSpecialImage> SkTileImageFilter::onFilterImage(SkSpecialImage* source, @@ -143,7 +143,7 @@ sk_sp<SkFlattenable> SkTileImageFilter::CreateProc(SkReadBuffer& buffer) { SkRect src, dst; buffer.readRect(&src); buffer.readRect(&dst); - return sk_sp<SkFlattenable>(Create(src, dst, common.getInput(0).get())); + return Make(src, dst, common.getInput(0)); } void SkTileImageFilter::flatten(SkWriteBuffer& buffer) const { |