diff options
author | 2016-04-03 09:11:13 -0700 | |
---|---|---|
committer | 2016-04-03 09:11:13 -0700 | |
commit | 60c9b58b3214b0154c931656e91e39b230e987d8 (patch) | |
tree | 6dd59cf90dd96a443a50ae4b6fa14be6f778c823 /src/effects/SkMergeImageFilter.cpp | |
parent | cf9bafceafaf6c0bf8b0eac8de509aa1d8407fca (diff) |
change flattenable factory to return sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1855733002
Review URL: https://codereview.chromium.org/1855733002
Diffstat (limited to 'src/effects/SkMergeImageFilter.cpp')
-rwxr-xr-x | src/effects/SkMergeImageFilter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp index cd16d43db3..44e6caf087 100755 --- a/src/effects/SkMergeImageFilter.cpp +++ b/src/effects/SkMergeImageFilter.cpp @@ -131,7 +131,7 @@ sk_sp<SkSpecialImage> SkMergeImageFilter::onFilterImage(SkSpecialImage* source, return surf->makeImageSnapshot(); } -SkFlattenable* SkMergeImageFilter::CreateProc(SkReadBuffer& buffer) { +sk_sp<SkFlattenable> SkMergeImageFilter::CreateProc(SkReadBuffer& buffer) { Common common; if (!common.unflatten(buffer, -1)) { return nullptr; @@ -152,9 +152,9 @@ SkFlattenable* SkMergeImageFilter::CreateProc(SkReadBuffer& buffer) { if (!buffer.isValid()) { return nullptr; } - return Make(common.inputs(), count, modes.get(), &common.cropRect()).release(); + return Make(common.inputs(), count, modes.get(), &common.cropRect()); } - return Make(common.inputs(), count, nullptr, &common.cropRect()).release(); + return Make(common.inputs(), count, nullptr, &common.cropRect()); } void SkMergeImageFilter::flatten(SkWriteBuffer& buffer) const { |