diff options
Diffstat (limited to 'src/effects')
| -rw-r--r-- | src/effects/SkBlurImageFilter.cpp | 8 | ||||
| -rw-r--r-- | src/effects/SkDropShadowImageFilter.cpp | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/effects/SkBlurImageFilter.cpp b/src/effects/SkBlurImageFilter.cpp index e7b326b7a9..b7745e27bf 100644 --- a/src/effects/SkBlurImageFilter.cpp +++ b/src/effects/SkBlurImageFilter.cpp @@ -37,17 +37,17 @@ static SkVector map_sigma(const SkSize& localSigma, const SkMatrix& ctm) { SkBlurImageFilter::SkBlurImageFilter(SkScalar sigmaX, SkScalar sigmaY, - SkImageFilter* input, + sk_sp<SkImageFilter> input, const CropRect* cropRect) - : INHERITED(1, &input, cropRect), fSigma(SkSize::Make(sigmaX, sigmaY)) { + : INHERITED(&input, 1, cropRect) + , fSigma(SkSize::Make(sigmaX, sigmaY)) { } sk_sp<SkFlattenable> SkBlurImageFilter::CreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1); SkScalar sigmaX = buffer.readScalar(); SkScalar sigmaY = buffer.readScalar(); - return sk_sp<SkFlattenable>(Create(sigmaX, sigmaY, common.getInput(0).get(), - &common.cropRect())); + return Make(sigmaX, sigmaY, common.getInput(0), &common.cropRect()); } void SkBlurImageFilter::flatten(SkWriteBuffer& buffer) const { diff --git a/src/effects/SkDropShadowImageFilter.cpp b/src/effects/SkDropShadowImageFilter.cpp index 331cfbd68b..9cacad5513 100644 --- a/src/effects/SkDropShadowImageFilter.cpp +++ b/src/effects/SkDropShadowImageFilter.cpp @@ -84,9 +84,8 @@ sk_sp<SkSpecialImage> SkDropShadowImageFilter::onFilterImage(SkSpecialImage* sou sigma.fX = SkMaxScalar(0, sigma.fX); sigma.fY = SkMaxScalar(0, sigma.fY); - SkAutoTUnref<SkImageFilter> blurFilter(SkBlurImageFilter::Create(sigma.fX, sigma.fY)); SkPaint paint; - paint.setImageFilter(blurFilter.get()); + paint.setImageFilter(SkBlurImageFilter::Make(sigma.fX, sigma.fY, nullptr)); paint.setColorFilter(SkColorFilter::MakeModeFilter(fColor, SkXfermode::kSrcIn_Mode)); paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); |