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 --- bench/BlurRoundRectBench.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bench/BlurRoundRectBench.cpp') diff --git a/bench/BlurRoundRectBench.cpp b/bench/BlurRoundRectBench.cpp index 46f410d3b3..85852d581e 100644 --- a/bench/BlurRoundRectBench.cpp +++ b/bench/BlurRoundRectBench.cpp @@ -54,8 +54,9 @@ public: SkBlurMask::ConvertRadiusToSigma(SK_ScalarHalf), SkBlurMaskFilter::kHighQuality_BlurFlag); paint->setMaskFilter(maskFilter)->unref(); - paint->setColorFilter(SkColorFilter::MakeModeFilter(SK_ColorLTGRAY, - SkXfermode::kSrcIn_Mode)); + SkColorFilter* colorFilter = SkColorFilter::CreateModeFilter(SK_ColorLTGRAY, + SkXfermode::kSrcIn_Mode); + paint->setColorFilter(colorFilter)->unref(); paint->setColor(SK_ColorGRAY); } { -- cgit v1.2.3