From d6889293dd0942f27f9593f679722c956831f2c4 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 22 Mar 2016 08:59:19 -0700 Subject: Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o… (patchset #3 id:40001 of https://codereview.chromium.org/1825073002/ ) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reason for revert: CreateModeFilter not compiling Original issue's description: > 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= > > Committed: https://skia.googlesource.com/skia/+/4c9776b046dd5e9e46e2d1ce35154855c8fcb381 TBR= # 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/1821103004 --- tools/android/SkAndroidSDKCanvas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/android') diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp index d7a76ca215..35b1581fda 100644 --- a/tools/android/SkAndroidSDKCanvas.cpp +++ b/tools/android/SkAndroidSDKCanvas.cpp @@ -69,7 +69,7 @@ void Filter(SkPaint* paint) { bool isMode = cf->asColorMode(&color, &mode); if (isMode && mode > SkXfermode::kLighten_Mode) { paint->setColorFilter( - SkColorFilter::MakeModeFilter(color, SkXfermode::kSrcOver_Mode)); + SkColorFilter::CreateModeFilter(color, SkXfermode::kSrcOver_Mode)); } else if (!isMode && !cf->asColorMatrix(srcColorMatrix)) { paint->setColorFilter(nullptr); } -- cgit v1.2.3