diff options
| author |  reed <reed@google.com> | 2016-03-13 14:13:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-13 14:13:58 -0700 |
| commit | 1a9b9640843a64af8d9d90337ec3b3fea663196a (patch) | |
| tree | 37dae22b03c887f2f0087309bbac84c983c828c5 /gm/lumafilter.cpp | |
| parent | 9283d20afc27571f7a871d1bd1100dd5df584941 (diff) | |
Reland of "more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium.org/1789633002/ )"
This reverts commit 9283d20afc27571f7a871d1bd1100dd5df584941.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1793303002
Review URL: https://codereview.chromium.org/1793303002
Diffstat (limited to 'gm/lumafilter.cpp')
| -rw-r--r-- | gm/lumafilter.cpp | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/gm/lumafilter.cpp b/gm/lumafilter.cpp index 3244b2b055..adffd008c1 100644 --- a/gm/lumafilter.cpp +++ b/gm/lumafilter.cpp @@ -26,9 +26,8 @@ static void draw_label(SkCanvas* canvas, const char* label, paint); } -static void draw_scene(SkCanvas* canvas, SkColorFilter* filter, - SkXfermode::Mode mode, SkShader* s1, - SkShader* s2) { +static void draw_scene(SkCanvas* canvas, SkColorFilter* filter, SkXfermode::Mode mode, + const sk_sp<SkShader>& s1, const sk_sp<SkShader>& s2) { SkPaint paint; paint.setAntiAlias(true); SkRect r, c, bounds = SkRect::MakeWH(kSize, kSize); @@ -85,16 +84,10 @@ public: SkScalar pos[] = { 0.2f, 1.0f }; fFilter.reset(SkLumaColorFilter::Create()); - fGr1.reset(SkGradientShader::CreateLinear(g1Points, - g1Colors, - pos, - SK_ARRAY_COUNT(g1Colors), - SkShader::kClamp_TileMode)); - fGr2.reset(SkGradientShader::CreateLinear(g2Points, - g2Colors, - pos, - SK_ARRAY_COUNT(g2Colors), - SkShader::kClamp_TileMode)); + fGr1 = SkGradientShader::MakeLinear(g1Points, g1Colors, pos, SK_ARRAY_COUNT(g1Colors), + SkShader::kClamp_TileMode); + fGr2 = SkGradientShader::MakeLinear(g2Points, g2Colors, pos, SK_ARRAY_COUNT(g2Colors), + SkShader::kClamp_TileMode); } protected: @@ -116,8 +109,8 @@ protected: SkXfermode::kDstIn_Mode, }; struct { - SkShader* fShader1; - SkShader* fShader2; + const sk_sp<SkShader>& fShader1; + const sk_sp<SkShader>& fShader2; } shaders[] = { { nullptr, nullptr }, { nullptr, fGr2 }, @@ -145,7 +138,7 @@ protected: private: SkAutoTUnref<SkColorFilter> fFilter; - SkAutoTUnref<SkShader> fGr1, fGr2; + sk_sp<SkShader> fGr1, fGr2; typedef skiagm::GM INHERITED; }; |