diff options
| author |  reed <reed@google.com> | 2016-03-22 08:10:17 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-22 08:10:17 -0700 |
| commit | 4c9776b046dd5e9e46e2d1ce35154855c8fcb381 (patch) | |
| tree | 3cdcc394a99b0483921eb86a8f5cc118f20d6433 /gm/lumafilter.cpp | |
| parent | 1eb81db650d31f50be67b12d60c4f9e7dd08432f (diff) | |
Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )"
Fixed legacy withColorFilter to call new(er) make method
This reverts commit 1eb81db650d31f50be67b12d60c4f9e7dd08432f.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825073002
TBR=
Review URL: https://codereview.chromium.org/1825073002
Diffstat (limited to 'gm/lumafilter.cpp')
| -rw-r--r-- | gm/lumafilter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/lumafilter.cpp b/gm/lumafilter.cpp index adffd008c1..10eefabd56 100644 --- a/gm/lumafilter.cpp +++ b/gm/lumafilter.cpp @@ -26,7 +26,7 @@ static void draw_label(SkCanvas* canvas, const char* label, paint); } -static void draw_scene(SkCanvas* canvas, SkColorFilter* filter, SkXfermode::Mode mode, +static void draw_scene(SkCanvas* canvas, const sk_sp<SkColorFilter>& filter, SkXfermode::Mode mode, const sk_sp<SkShader>& s1, const sk_sp<SkShader>& s2) { SkPaint paint; paint.setAntiAlias(true); @@ -83,7 +83,7 @@ public: SkPoint g2Points[] = { { 0, 0 }, { kSize, 0 } }; SkScalar pos[] = { 0.2f, 1.0f }; - fFilter.reset(SkLumaColorFilter::Create()); + fFilter = SkLumaColorFilter::Make(); fGr1 = SkGradientShader::MakeLinear(g1Points, g1Colors, pos, SK_ARRAY_COUNT(g1Colors), SkShader::kClamp_TileMode); fGr2 = SkGradientShader::MakeLinear(g2Points, g2Colors, pos, SK_ARRAY_COUNT(g2Colors), @@ -137,8 +137,8 @@ protected: } private: - SkAutoTUnref<SkColorFilter> fFilter; - sk_sp<SkShader> fGr1, fGr2; + sk_sp<SkColorFilter> fFilter; + sk_sp<SkShader> fGr1, fGr2; typedef skiagm::GM INHERITED; }; |