diff options
| author |  reed <reed@google.com> | 2016-03-13 13:01:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-13 13:01:57 -0700 |
| commit | 9283d20afc27571f7a871d1bd1100dd5df584941 (patch) | |
| tree | 3688fa1847d47e1f2493b040bbe91594f6274cf0 /gm/lumafilter.cpp | |
| parent | ce563cdd48ec7ce4e0420dd88760df9be9dba50c (diff) | |
Revert of more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium.org/1789633002/ )
Reason for revert:
seems to have changed pictureshadertile
Original issue's description:
> more shader-->sp conversions
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789633002
>
> Committed: https://skia.googlesource.com/skia/+/ce563cdd48ec7ce4e0420dd88760df9be9dba50c
TBR=fmalita@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1790353002
Diffstat (limited to 'gm/lumafilter.cpp')
| -rw-r--r-- | gm/lumafilter.cpp | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/gm/lumafilter.cpp b/gm/lumafilter.cpp index adffd008c1..3244b2b055 100644 --- a/gm/lumafilter.cpp +++ b/gm/lumafilter.cpp @@ -26,8 +26,9 @@ static void draw_label(SkCanvas* canvas, const char* label, paint); } -static void draw_scene(SkCanvas* canvas, SkColorFilter* filter, SkXfermode::Mode mode, - const sk_sp<SkShader>& s1, const sk_sp<SkShader>& s2) { +static void draw_scene(SkCanvas* canvas, SkColorFilter* filter, + SkXfermode::Mode mode, SkShader* s1, + SkShader* s2) { SkPaint paint; paint.setAntiAlias(true); SkRect r, c, bounds = SkRect::MakeWH(kSize, kSize); @@ -84,10 +85,16 @@ public: SkScalar pos[] = { 0.2f, 1.0f }; fFilter.reset(SkLumaColorFilter::Create()); - 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); + 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)); } protected: @@ -109,8 +116,8 @@ protected: SkXfermode::kDstIn_Mode, }; struct { - const sk_sp<SkShader>& fShader1; - const sk_sp<SkShader>& fShader2; + SkShader* fShader1; + SkShader* fShader2; } shaders[] = { { nullptr, nullptr }, { nullptr, fGr2 }, @@ -138,7 +145,7 @@ protected: private: SkAutoTUnref<SkColorFilter> fFilter; - sk_sp<SkShader> fGr1, fGr2; + SkAutoTUnref<SkShader> fGr1, fGr2; typedef skiagm::GM INHERITED; }; |