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 /samplecode/SampleAll.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 'samplecode/SampleAll.cpp')
| -rw-r--r-- | samplecode/SampleAll.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index aa08261200..357a437a67 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -77,9 +77,9 @@ private: /////////////////////////////////////////////////////////// static void r0(SkLayerRasterizer::Builder* rastBuilder, SkPaint& p) { - p.setMaskFilter(SkBlurMaskFilter::Create(kNormal_SkBlurStyle, - SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3)), - SkBlurMaskFilter::kNone_BlurFlag))->unref(); + p.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle, + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3)), + SkBlurMaskFilter::kNone_BlurFlag)); rastBuilder->addLayer(p, SkIntToScalar(3), SkIntToScalar(3)); p.setMaskFilter(nullptr); @@ -250,9 +250,9 @@ static void apply_shader(SkPaint* paint, int index) { #if 1 SkScalar dir[] = { SK_Scalar1, SK_Scalar1, SK_Scalar1 }; - paint->setMaskFilter(SkBlurMaskFilter::CreateEmboss( + paint->setMaskFilter(SkBlurMaskFilter::MakeEmboss( SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(3)), dir, - SK_Scalar1/4, SkIntToScalar(4)))->unref(); + SK_Scalar1/4, SkIntToScalar(4))); paint->setColor(SK_ColorBLUE); #endif } @@ -379,8 +379,6 @@ protected: light.fDirection[2] = SK_Scalar1/3; light.fAmbient = 0x48; light.fSpecular = 0x80; - SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(12)/5); - SkMaskFilter* embossFilter = SkEmbossMaskFilter::Create(sigma, light); auto lightingFilter = SkColorMatrixFilter::MakeLightingFilter( 0xff89bc45, 0xff112233); @@ -420,7 +418,8 @@ protected: // circle w/ emboss & transparent (exercises 3dshader) canvas->translate(SkIntToScalar(50), 0); - paint.setMaskFilter(embossFilter)->unref(); + paint.setMaskFilter(SkEmbossMaskFilter::Make( + SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(12)/5), light)); canvas->drawOval(rect, paint); canvas->translate(SkIntToScalar(10), SkIntToScalar(10)); // paint.setShader(transparentShader)->unref(); |