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 --- gm/recordopts.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gm/recordopts.cpp') diff --git a/gm/recordopts.cpp b/gm/recordopts.cpp index bac6d8858c..97d13cb9c9 100644 --- a/gm/recordopts.cpp +++ b/gm/recordopts.cpp @@ -22,26 +22,26 @@ static const int kDetectorGreenValue = 50; // kDetectorGreenValue and then the incorrect value is observable by some part of the drawing // pipeline, that pixel will remain empty. -static sk_sp make_detector_color_filter() { +static SkColorFilter* make_detector_color_filter() { uint8_t tableA[256] = { 0, }; uint8_t tableR[256] = { 0, }; uint8_t tableG[256] = { 0, }; uint8_t tableB[256] = { 0, }; tableA[255] = 255; tableG[kDetectorGreenValue] = 255; - return SkTableColorFilter::MakeARGB(tableA, tableR, tableG, tableB); + return SkTableColorFilter::CreateARGB(tableA, tableR, tableG, tableB); } // This detector detects that color filter phase of the pixel pipeline receives the correct value. static void install_detector_color_filter(SkPaint* drawPaint) { - drawPaint->setColorFilter(make_detector_color_filter()); + drawPaint->setColorFilter(make_detector_color_filter())->unref(); } // This detector detects that image filter phase of the pixel pipeline receives the correct value. static void install_detector_image_filter(SkPaint* drawPaint) { - auto colorFilter(make_detector_color_filter()); + SkAutoTUnref colorFilter(make_detector_color_filter()); SkImageFilter* imageFilter = - SkColorFilterImageFilter::Create(colorFilter.get(), drawPaint->getImageFilter()); + SkColorFilterImageFilter::Create(colorFilter, drawPaint->getImageFilter()); drawPaint->setImageFilter(imageFilter)->unref(); } -- cgit v1.2.3