diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-30 13:34:16 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-30 13:34:17 -0700 |
| commit | 2238c9dbca4b791edc512957728a18ce14d55912 (patch) | |
| tree | 684102215b697506f7c2dce012bb89183467e208 /src/effects/SkMergeImageFilter.cpp | |
| parent | 3243143f25f4ccba632847574cf8e1a8ee0fe0f2 (diff) | |
Update SkMergeImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1847583002
Review URL: https://codereview.chromium.org/1847583002
Diffstat (limited to 'src/effects/SkMergeImageFilter.cpp')
| -rwxr-xr-x | src/effects/SkMergeImageFilter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp index 47d33dffb4..07b2c1cf3e 100755 --- a/src/effects/SkMergeImageFilter.cpp +++ b/src/effects/SkMergeImageFilter.cpp @@ -42,10 +42,10 @@ void SkMergeImageFilter::initModes(const SkXfermode::Mode modes[]) { } } -SkMergeImageFilter::SkMergeImageFilter(SkImageFilter* filters[], int count, +SkMergeImageFilter::SkMergeImageFilter(sk_sp<SkImageFilter> filters[], int count, const SkXfermode::Mode modes[], const CropRect* cropRect) - : INHERITED(count, filters, cropRect) { + : INHERITED(filters, count, cropRect) { SkASSERT(count >= 0); this->initModes(modes); } @@ -149,9 +149,9 @@ SkFlattenable* SkMergeImageFilter::CreateProc(SkReadBuffer& buffer) { if (!buffer.isValid()) { return nullptr; } - return Create(common.inputs(), count, modes.get(), &common.cropRect()); + return Make(common.inputs(), count, modes.get(), &common.cropRect()).release(); } - return Create(common.inputs(), count, nullptr, &common.cropRect()); + return Make(common.inputs(), count, nullptr, &common.cropRect()).release(); } void SkMergeImageFilter::flatten(SkWriteBuffer& buffer) const { |