From f809d7687a4fb7b88b651b046da2bc0035d6aa09 Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 22 Mar 2016 07:23:24 -0700 Subject: 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 Review URL: https://codereview.chromium.org/1822623002 --- 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 97d13cb9c9..bac6d8858c 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 SkColorFilter* make_detector_color_filter() { +static sk_sp 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::CreateARGB(tableA, tableR, tableG, tableB); + return SkTableColorFilter::MakeARGB(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())->unref(); + drawPaint->setColorFilter(make_detector_color_filter()); } // This detector detects that image filter phase of the pixel pipeline receives the correct value. static void install_detector_image_filter(SkPaint* drawPaint) { - SkAutoTUnref colorFilter(make_detector_color_filter()); + auto colorFilter(make_detector_color_filter()); SkImageFilter* imageFilter = - SkColorFilterImageFilter::Create(colorFilter, drawPaint->getImageFilter()); + SkColorFilterImageFilter::Create(colorFilter.get(), drawPaint->getImageFilter()); drawPaint->setImageFilter(imageFilter)->unref(); } -- cgit v1.2.3