diff options
| author |  reed <reed@google.com> | 2016-03-22 07:35:17 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-22 07:35:17 -0700 |
| commit | 1eb81db650d31f50be67b12d60c4f9e7dd08432f (patch) | |
| tree | 58a5fd565f06a398192be170009fefa2a12a1ee2 /gm/lumafilter.cpp | |
| parent | ee451cf09de31267c93b64e1fdac7c823cee7e85 (diff) | |
Revert of switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )
Reason for revert:
need to fix unguarded makeWithFilter
Original issue's description:
> switch colorfilters to sk_sp
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1822623002
>
> Committed: https://skia.googlesource.com/skia/+/f809d7687a4fb7b88b651b046da2bc0035d6aa09
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/1820303002
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 10eefabd56..adffd008c1 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, const sk_sp<SkColorFilter>& filter, SkXfermode::Mode mode, +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); @@ -83,7 +83,7 @@ public: SkPoint g2Points[] = { { 0, 0 }, { kSize, 0 } }; SkScalar pos[] = { 0.2f, 1.0f }; - fFilter = SkLumaColorFilter::Make(); + 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), @@ -137,8 +137,8 @@ protected: } private: - sk_sp<SkColorFilter> fFilter; - sk_sp<SkShader> fGr1, fGr2; + SkAutoTUnref<SkColorFilter> fFilter; + sk_sp<SkShader> fGr1, fGr2; typedef skiagm::GM INHERITED; }; |