From 1eb81db650d31f50be67b12d60c4f9e7dd08432f Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 22 Mar 2016 07:35:17 -0700 Subject: 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 --- gm/lumafilter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gm/lumafilter.cpp') 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& filter, SkXfermode::Mode mode, +static void draw_scene(SkCanvas* canvas, SkColorFilter* filter, SkXfermode::Mode mode, const sk_sp& s1, const sk_sp& 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 fFilter; - sk_sp fGr1, fGr2; + SkAutoTUnref fFilter; + sk_sp fGr1, fGr2; typedef skiagm::GM INHERITED; }; -- cgit v1.2.3