Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o…

gm/recordopts.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
 #include "SkPictureRecorder.h"
 #include "SkTableColorFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkPictureImageFilter.h"
 
 static const int kTestRectSize = 50;
 static const int kDetectorGreenValue = 50;
 
 // Below are few functions to install "detector" color filters. The filter is there to assert that
 // the color value it sees is the expected. It will trigger only with kDetectorGreenValue, and
 // turn that value into full green. The idea is that if an optimization incorrectly changes
 // kDetectorGreenValue and then the incorrect value is observable by some part of the drawing
 // pipeline, that pixel will remain empty.
 
-static sk_sp<SkColorFilter> 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<SkColorFilter> colorFilter(make_detector_color_filter());
     SkImageFilter* imageFilter =
-            SkColorFilterImageFilter::Create(colorFilter.get(), drawPaint->getImageFilter());
+            SkColorFilterImageFilter::Create(colorFilter, drawPaint->getImageFilter());
     drawPaint->setImageFilter(imageFilter)->unref();
 }
 
 static void no_detector_install(SkPaint*) {
 }
 
 typedef void(*InstallDetectorFunc)(SkPaint*);
 
 
 // Draws an pattern that can be optimized by alpha folding outer savelayer alpha value to
@@ skipping 152 matching lines @@
                 }
 
                 canvas->restore();
                 canvas->translate(SkIntToScalar(0), SkIntToScalar(kTestRectSize) + SkIntToScalar(1));
             }
 
         }
     }
 }