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/fadefilter.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gm/fadefilter.cpp') diff --git a/gm/fadefilter.cpp b/gm/fadefilter.cpp index 386e32b098..6f64e1e30e 100644 --- a/gm/fadefilter.cpp +++ b/gm/fadefilter.cpp @@ -15,8 +15,10 @@ DEF_SIMPLE_GM(fadefilter, canvas, 256, 256) { 0, 1, 0, 0, 128.0f, 0, 0, 1, 0, 128.0f, 0, 0, 0, 1, 0 }; - auto colorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix)); - SkAutoTUnref filter(SkColorFilterImageFilter::Create(colorFilter.get())); + SkAutoTUnref colorFilter( + SkColorMatrixFilter::Create(matrix)); + SkAutoTUnref filter( + SkColorFilterImageFilter::Create(colorFilter)); SkPaint layerPaint; layerPaint.setImageFilter(filter); canvas->drawRect(SkRect::MakeLTRB(64, 64, 192, 192), layerPaint); -- cgit v1.2.3