diff options
author | reed <reed@google.com> | 2016-04-04 10:02:58 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-04 10:02:58 -0700 |
commit | efdfd51b68a300d5c6e28743fe0344ca05d1cec9 (patch) | |
tree | 3cd04d31a56219559e89f6eded6f7a894eb700ba /src/effects/SkEmbossMaskFilter.cpp | |
parent | 175cf0e51b9fbb075588c4d29e7e4257cea6f4ad (diff) |
switch maskfilters to sk_sp
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852113003
Review URL: https://codereview.chromium.org/1852113003
Diffstat (limited to 'src/effects/SkEmbossMaskFilter.cpp')
-rw-r--r-- | src/effects/SkEmbossMaskFilter.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp index aa93e5a594..5f3952d1ad 100644 --- a/src/effects/SkEmbossMaskFilter.cpp +++ b/src/effects/SkEmbossMaskFilter.cpp @@ -13,19 +13,21 @@ #include "SkWriteBuffer.h" #include "SkString.h" -SkMaskFilter* SkEmbossMaskFilter::Create(SkScalar blurSigma, const Light& light) { - return new SkEmbossMaskFilter(blurSigma, light); +sk_sp<SkMaskFilter> SkEmbossMaskFilter::Make(SkScalar blurSigma, const Light& light) { + return sk_sp<SkMaskFilter>(new SkEmbossMaskFilter(blurSigma, light)); } +#ifdef SK_SUPPORT_LEGACY_MASKFILTER_PTR SkMaskFilter* SkBlurMaskFilter::CreateEmboss(const SkScalar direction[3], SkScalar ambient, SkScalar specular, SkScalar blurRadius) { return SkBlurMaskFilter::CreateEmboss(SkBlurMask::ConvertRadiusToSigma(blurRadius), direction, ambient, specular); } +#endif -SkMaskFilter* SkBlurMaskFilter::CreateEmboss(SkScalar blurSigma, const SkScalar direction[3], - SkScalar ambient, SkScalar specular) { +sk_sp<SkMaskFilter> SkBlurMaskFilter::MakeEmboss(SkScalar blurSigma, const SkScalar direction[3], + SkScalar ambient, SkScalar specular) { if (direction == nullptr) { return nullptr; } @@ -39,7 +41,7 @@ SkMaskFilter* SkBlurMaskFilter::CreateEmboss(SkScalar blurSigma, const SkScalar static const SkScalar kSpecularMultiplier = SkIntToScalar(255) / 16; light.fSpecular = static_cast<U8CPU>(SkScalarPin(specular, 0, 16) * kSpecularMultiplier + 0.5); - return SkEmbossMaskFilter::Create(blurSigma, light); + return SkEmbossMaskFilter::Make(blurSigma, light); } /////////////////////////////////////////////////////////////////////////////// @@ -117,7 +119,7 @@ sk_sp<SkFlattenable> SkEmbossMaskFilter::CreateProc(SkReadBuffer& buffer) { if (buffer.readByteArray(&light, sizeof(Light))) { light.fPad = 0; // for the font-cache lookup to be clean const SkScalar sigma = buffer.readScalar(); - return sk_sp<SkFlattenable>(Create(sigma, light)); + return Make(sigma, light); } return nullptr; } |