diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-04 04:31:25 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-04 04:31:25 -0700 |
| commit | 6e7025ab13dfc4f0037233e67b4b8e18d6dfd1e1 (patch) | |
| tree | ad46002c401ef4bd42ac963a1f8eed09beeb90b3 /src | |
| parent | 60c9b58b3214b0154c931656e91e39b230e987d8 (diff) | |
Update SkBlurImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852743002
Review URL: https://codereview.chromium.org/1852743002
Diffstat (limited to 'src')
| -rw-r--r-- | src/effects/SkBlurImageFilter.cpp | 8 | ||||
| -rw-r--r-- | src/effects/SkDropShadowImageFilter.cpp | 3 | ||||
| -rw-r--r-- | src/utils/SkLua.cpp | 9 |
3 files changed, 10 insertions, 10 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); diff --git a/src/utils/SkLua.cpp b/src/utils/SkLua.cpp index 9af5bfd84e..9369a6bd9d 100644 --- a/src/utils/SkLua.cpp +++ b/src/utils/SkLua.cpp @@ -1963,11 +1963,11 @@ static int lsk_newDocumentPDF(lua_State* L) { static int lsk_newBlurImageFilter(lua_State* L) { SkScalar sigmaX = lua2scalar_def(L, 1, 0); SkScalar sigmaY = lua2scalar_def(L, 2, 0); - SkImageFilter* imf = SkBlurImageFilter::Create(sigmaX, sigmaY); - if (nullptr == imf) { + sk_sp<SkImageFilter> imf(SkBlurImageFilter::Make(sigmaX, sigmaY, nullptr)); + if (!imf) { lua_pushnil(L); } else { - push_ref(L, imf)->unref(); + push_ref(L, std::move(imf)); } return 1; } @@ -1982,7 +1982,8 @@ static int lsk_newLinearGradient(lua_State* L) { SkPoint pts[] = { { x0, y0 }, { x1, y1 } }; SkColor colors[] = { c0, c1 }; - auto s = SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode); + sk_sp<SkShader> s(SkGradientShader::MakeLinear(pts, colors, nullptr, 2, + SkShader::kClamp_TileMode)); if (!s) { lua_pushnil(L); } else { |