diff options
| author |  robertphillips <robertphillips@google.com> | 2016-03-30 12:32:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-30 12:32:58 -0700 |
| commit | 491fb17cab07574a9d5656c1c97ad0acc3af5c70 (patch) | |
| tree | 7e6577620cf303677ba308a2590b4a1d1938d24e /src | |
| parent | d632bb4dfc184d7c523bb436940c182ed42551ea (diff) | |
Update SkComposeImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1841233002
Review URL: https://codereview.chromium.org/1841233002
Diffstat (limited to 'src')
| -rw-r--r-- | src/effects/SkComposeImageFilter.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/effects/SkComposeImageFilter.cpp b/src/effects/SkComposeImageFilter.cpp index c6722d5458..3cd8a9e6fd 100644 --- a/src/effects/SkComposeImageFilter.cpp +++ b/src/effects/SkComposeImageFilter.cpp @@ -13,8 +13,8 @@ SkRect SkComposeImageFilter::computeFastBounds(const SkRect& src) const { - SkImageFilter* outer = getInput(0); - SkImageFilter* inner = getInput(1); + SkImageFilter* outer = this->getInput(0); + SkImageFilter* inner = this->getInput(1); return outer->computeFastBounds(inner->computeFastBounds(src)); } @@ -26,7 +26,7 @@ sk_sp<SkSpecialImage> SkComposeImageFilter::onFilterImage(SkSpecialImage* source // filter, so that the inner filter produces the pixels that the outer // filter requires as input. This matters if the outer filter moves pixels. SkIRect innerClipBounds; - innerClipBounds = getInput(0)->filterBounds(ctx.clipBounds(), ctx.ctm()); + innerClipBounds = this->getInput(0)->filterBounds(ctx.clipBounds(), ctx.ctm()); Context innerContext(ctx.ctm(), innerClipBounds, ctx.cache()); SkIPoint innerOffset = SkIPoint::Make(0, 0); sk_sp<SkSpecialImage> inner(this->filterInput(1, source, innerContext, &innerOffset)); @@ -60,7 +60,8 @@ SkIRect SkComposeImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& SkFlattenable* SkComposeImageFilter::CreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2); - return SkComposeImageFilter::Create(common.getInput(0), common.getInput(1)); + return SkComposeImageFilter::Make(sk_ref_sp<SkImageFilter>(common.getInput(0)), + sk_ref_sp<SkImageFilter>(common.getInput(1))).release(); } #ifndef SK_IGNORE_TO_STRING |