From 4c9776b046dd5e9e46e2d1ce35154855c8fcb381 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 22 Mar 2016 08:10:17 -0700 Subject: Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )" Fixed legacy withColorFilter to call new(er) make method This reverts commit 1eb81db650d31f50be67b12d60c4f9e7dd08432f. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825073002 TBR= Review URL: https://codereview.chromium.org/1825073002 --- samplecode/SampleAll.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'samplecode/SampleAll.cpp') diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index b8b0ee677d..70ecd9fe7e 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -384,7 +384,7 @@ protected: SkMaskFilter* embossFilter = SkEmbossMaskFilter::Create(sigma, light); SkXfermode* xfermode = SkXfermode::Create(SkXfermode::kXor_Mode); - SkColorFilter* lightingFilter = SkColorMatrixFilter::CreateLightingFilter( + auto lightingFilter = SkColorMatrixFilter::MakeLightingFilter( 0xff89bc45, 0xff112233); canvas->save(); @@ -406,7 +406,7 @@ protected: paint.setStrokeWidth(SkIntToScalar(10)); paint.setStyle(SkPaint::kStroke_Style); paint.setXfermode(xfermode)->unref(); - paint.setColorFilter(lightingFilter)->unref(); + paint.setColorFilter(lightingFilter); canvas->drawLine(start.fX, start.fY, stop.fX, stop.fY, paint); // should not be green paint.setXfermode(nullptr); paint.setColorFilter(nullptr); @@ -543,9 +543,9 @@ protected: #if 01 int index = i % SK_ARRAY_COUNT(gLightingColors); - paint.setColorFilter(SkColorMatrixFilter::CreateLightingFilter( + paint.setColorFilter(SkColorMatrixFilter::MakeLightingFilter( gLightingColors[index].fMul, - gLightingColors[index].fAdd))->unref(); + gLightingColors[index].fAdd)); #endif canvas->drawText(str.c_str(), str.size(), x, y, paint); -- cgit v1.2.3