diff options
| author |  reed <reed@google.com> | 2016-03-09 09:50:50 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-09 09:50:50 -0800 |
| commit | 2ad1aa67c6894696cdd65ec56057f81031d1c24a (patch) | |
| tree | 867b2bf372ee13336e3f0525a72d017025a97455 /gm/coloremoji.cpp | |
| parent | 7f229ed827d1dc5897acfa87d84b642ce34b678f (diff) | |
partial switch over to sp usage of shaders
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1776973003
Review URL: https://codereview.chromium.org/1776973003
Diffstat (limited to 'gm/coloremoji.cpp')
| -rw-r--r-- | gm/coloremoji.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index 6dddc0fdc6..78c347c079 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -19,12 +19,12 @@ /* * Spits out a dummy gradient to test blur with shader on paint */ -static SkShader* MakeLinear() { +static sk_sp<SkShader> MakeLinear() { static const SkPoint kPts[] = { { 0, 0 }, { 32, 32 } }; static const SkScalar kPos[] = { 0, SK_Scalar1/2, SK_Scalar1 }; static const SkColor kColors[] = {0x80F00080, 0xF0F08000, 0x800080F0 }; - return SkGradientShader::CreateLinear(kPts, kColors, kPos, - SK_ARRAY_COUNT(kColors), SkShader::kClamp_TileMode); + return SkGradientShader::MakeLinear(kPts, kColors, kPos, SK_ARRAY_COUNT(kColors), + SkShader::kClamp_TileMode); } static SkImageFilter* make_grayscale(SkImageFilter* input = nullptr) { @@ -94,7 +94,7 @@ protected: SkPaint shaderPaint; shaderPaint.setTypeface(paint.getTypeface()); if (SkToBool(makeLinear)) { - shaderPaint.setShader(MakeLinear())->unref(); + shaderPaint.setShader(MakeLinear()); } if (SkToBool(makeBlur) && SkToBool(makeGray)) { |