diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-01 10:34:43 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-01 10:34:43 -0700 |
| commit | f624204300d8cd3b2cdb933b144980ff56852d42 (patch) | |
| tree | 3b46369860c5456f53daf67ec082afb7d6638029 /src | |
| parent | 8f1dcaa6f3cc098bd5efd2595ca20e0bc1847d10 (diff) | |
Update SkAlphaThresholdFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1847053004
Review URL: https://codereview.chromium.org/1847053004
Diffstat (limited to 'src')
| -rw-r--r-- | src/effects/SkAlphaThresholdFilter.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 177a3ba5f0..1c79c45194 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -6,6 +6,7 @@ */ #include "SkAlphaThresholdFilter.h" + #include "SkBitmap.h" #include "SkDevice.h" #include "SkReadBuffer.h" @@ -18,7 +19,7 @@ class SK_API SkAlphaThresholdFilterImpl : public SkImageFilter { public: SkAlphaThresholdFilterImpl(const SkRegion& region, SkScalar innerThreshold, - SkScalar outerThreshold, SkImageFilter* input); + SkScalar outerThreshold, sk_sp<SkImageFilter> input); SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkAlphaThresholdFilterImpl) @@ -49,16 +50,17 @@ static SkScalar pin_0_1(SkScalar x) { return SkMinScalar(SkMaxScalar(x, 0), 1); } -SkImageFilter* SkAlphaThresholdFilter::Create(const SkRegion& region, - SkScalar innerThreshold, - SkScalar outerThreshold, - SkImageFilter* input) { +sk_sp<SkImageFilter> SkAlphaThresholdFilter::Make(const SkRegion& region, + SkScalar innerThreshold, + SkScalar outerThreshold, + sk_sp<SkImageFilter> input) { innerThreshold = pin_0_1(innerThreshold); outerThreshold = pin_0_1(outerThreshold); if (!SkScalarIsFinite(innerThreshold) || !SkScalarIsFinite(outerThreshold)) { return nullptr; } - return new SkAlphaThresholdFilterImpl(region, innerThreshold, outerThreshold, input); + return sk_sp<SkImageFilter>(new SkAlphaThresholdFilterImpl(region, innerThreshold, + outerThreshold, std::move(input))); } #if SK_SUPPORT_GPU @@ -269,14 +271,14 @@ SkFlattenable* SkAlphaThresholdFilterImpl::CreateProc(SkReadBuffer& buffer) { SkScalar outer = buffer.readScalar(); SkRegion rgn; buffer.readRegion(&rgn); - return SkAlphaThresholdFilter::Create(rgn, inner, outer, common.getInput(0).get()); + return SkAlphaThresholdFilter::Make(rgn, inner, outer, common.getInput(0)).release(); } SkAlphaThresholdFilterImpl::SkAlphaThresholdFilterImpl(const SkRegion& region, SkScalar innerThreshold, SkScalar outerThreshold, - SkImageFilter* input) - : INHERITED(1, &input) + sk_sp<SkImageFilter> input) + : INHERITED(&input, 1, nullptr) , fRegion(region) , fInnerThreshold(innerThreshold) , fOuterThreshold(outerThreshold) { |