diff options
author | reed <reed@google.com> | 2016-04-03 09:11:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-03 09:11:13 -0700 |
commit | 60c9b58b3214b0154c931656e91e39b230e987d8 (patch) | |
tree | 6dd59cf90dd96a443a50ae4b6fa14be6f778c823 /src/effects/SkLightingImageFilter.cpp | |
parent | cf9bafceafaf6c0bf8b0eac8de509aa1d8407fca (diff) |
change flattenable factory to return sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1855733002
Review URL: https://codereview.chromium.org/1855733002
Diffstat (limited to 'src/effects/SkLightingImageFilter.cpp')
-rw-r--r-- | src/effects/SkLightingImageFilter.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 55a1f22909..c27a55476f 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -1210,12 +1210,13 @@ SkDiffuseLightingImageFilter::SkDiffuseLightingImageFilter(SkImageFilterLight* l { } -SkFlattenable* SkDiffuseLightingImageFilter::CreateProc(SkReadBuffer& buffer) { +sk_sp<SkFlattenable> SkDiffuseLightingImageFilter::CreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1); SkAutoTUnref<SkImageFilterLight> light(SkImageFilterLight::UnflattenLight(buffer)); SkScalar surfaceScale = buffer.readScalar(); SkScalar kd = buffer.readScalar(); - return Create(light, surfaceScale, kd, common.getInput(0).get(), &common.cropRect()); + return sk_sp<SkFlattenable>(Create(light, surfaceScale, kd, common.getInput(0).get(), + &common.cropRect())); } void SkDiffuseLightingImageFilter::flatten(SkWriteBuffer& buffer) const { @@ -1352,13 +1353,14 @@ SkSpecularLightingImageFilter::SkSpecularLightingImageFilter(SkImageFilterLight* { } -SkFlattenable* SkSpecularLightingImageFilter::CreateProc(SkReadBuffer& buffer) { +sk_sp<SkFlattenable> SkSpecularLightingImageFilter::CreateProc(SkReadBuffer& buffer) { SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1); SkAutoTUnref<SkImageFilterLight> light(SkImageFilterLight::UnflattenLight(buffer)); SkScalar surfaceScale = buffer.readScalar(); SkScalar ks = buffer.readScalar(); SkScalar shine = buffer.readScalar(); - return Create(light, surfaceScale, ks, shine, common.getInput(0).get(), &common.cropRect()); + return sk_sp<SkFlattenable>(Create(light, surfaceScale, ks, shine, common.getInput(0).get(), + &common.cropRect())); } void SkSpecularLightingImageFilter::flatten(SkWriteBuffer& buffer) const { |