Revert of switch colorfilters to sk_sp

tests/SkColor4fTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColor.h"
 #include "SkColorMatrixFilter.h"
 #include "SkGradientShader.h"
@@ skipping 60 matching lines @@
         pm4 = c4.premul();
         REPORTER_ASSERT(reporter, pm4.fVec[SK_A_INDEX] == c4.fA);
         REPORTER_ASSERT(reporter, nearly_equal(pm4.r(), c4.fA * c4.fR));
         REPORTER_ASSERT(reporter, nearly_equal(pm4.g(), c4.fA * c4.fG));
         REPORTER_ASSERT(reporter, nearly_equal(pm4.b(), c4.fA * c4.fB));
     }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
-static sk_sp<SkColorFilter> make_mode_cf() {
-    return SkColorFilter::MakeModeFilter(0xFFBB8855, SkXfermode::kPlus_Mode);
+static SkColorFilter* make_mode_cf() {
+    return SkColorFilter::CreateModeFilter(0xFFBB8855, SkXfermode::kPlus_Mode);
 }
 
-static sk_sp<SkColorFilter> make_mx_cf() {
+static SkColorFilter* make_mx_cf() {
     const float mx[] = {
         0.5f, 0,    0, 0, 0.1f,
         0,    0.5f, 0, 0, 0.2f,
         0,    0,    1, 0, -0.1f,
         0,    0,    0, 1, 0,
     };
-    return SkColorFilter::MakeMatrixFilterRowMajor255(mx);
+    return SkColorMatrixFilter::Create(mx);
 }
 
-static sk_sp<SkColorFilter> make_compose_cf() {
-    return SkColorFilter::MakeComposeFilter(make_mode_cf(), make_mx_cf());
+static SkColorFilter* make_compose_cf() {
+    SkAutoTUnref<SkColorFilter> cf0(make_mode_cf());
+    SkAutoTUnref<SkColorFilter> cf1(make_mx_cf());
+    return SkColorFilter::CreateComposeFilter(cf0, cf1);
 }
 
 static sk_sp<SkShader> make_color_sh() { return SkShader::MakeColorShader(0xFFBB8855); }
 
 static sk_sp<SkShader> make_image_sh() {
     const SkImageInfo info = SkImageInfo::MakeN32Premul(2, 2);
     const SkPMColor pixels[] {
         SkPackARGB32(0xFF, 0xBB, 0x88, 0x55),
         SkPackARGB32(0xFF, 0xBB, 0x88, 0x55),
         SkPackARGB32(0xFF, 0xBB, 0x88, 0x55),
         SkPackARGB32(0xFF, 0xBB, 0x88, 0x55),
     };
     sk_sp<SkImage> image(SkImage::MakeRasterCopy(SkPixmap(info, pixels, sizeof(SkPMColor) * 2)));
     return image->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
 }
 
 static sk_sp<SkShader> make_grad_sh() {
 #if 0
     const SkPoint pts[] {{ 0, 0 }, { 100, 100 }};
     const SkColor colors[] { SK_ColorRED, SK_ColorBLUE };
     return SkGradientShader::CreateLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode);
 #else
     // TODO: need to convert new gradient code to enforce PM4f --> RGBA order
     return make_color_sh();
 #endif
 }
 
 static sk_sp<SkShader> make_cf_sh() {
-    return make_color_sh()->makeWithColorFilter(make_mx_cf());
+    SkAutoTUnref<SkColorFilter> filter(make_mx_cf());
+    return make_color_sh()->makeWithColorFilter(filter);
 }
 
 static bool compare_spans(const SkPM4f span4f[], const SkPMColor span4b[], int count,
                           float tolerance = 1.0f/255) {
     for (int i = 0; i < count; ++i) {
         SkPM4f c0 = SkPM4f::FromPMColor(span4b[i]);
         SkPM4f c1 = span4f[i];
         if (!nearly_equal(c0, c1, tolerance)) {
             return false;
         }
@@ skipping 32 matching lines @@
             SkPMColor buffer4b[N];
             ctx->shadeSpan(0, 0, buffer4b, N);
             REPORTER_ASSERT(reporter, compare_spans(buffer4f, buffer4b, N, rec.fTolerance));
         }
         ctx->~Context();
     }
 }
 
 DEF_TEST(Color4f_colorfilter, reporter) {
     struct {
-        sk_sp<SkColorFilter>    (*fFact)();
-        bool                    fSupports4f;
-        const char*             fName;
+        SkColorFilter* (*fFact)();
+        bool           fSupports4f;
+        const char*    fName;
     } recs[] = {
         { make_mode_cf,     true, "mode" },
         { make_mx_cf,       true, "matrix" },
         { make_compose_cf,  true, "compose" },
     };
 
     // prepare the src
     const int N = 100;
     SkPMColor src4b[N];
     SkPM4f    src4f[N];
     SkRandom rand;
     for (int i = 0; i < N; ++i) {
         src4b[i] = SkPreMultiplyColor(rand.nextU());
         src4f[i] = SkPM4f::FromPMColor(src4b[i]);
     }
     // confirm that our srcs are (nearly) equal
     REPORTER_ASSERT(reporter, compare_spans(src4f, src4b, N));
 
     for (const auto& rec : recs) {
-        auto filter(rec.fFact());
+        SkAutoTUnref<SkColorFilter> filter(rec.fFact());
         SkPMColor dst4b[N];
         filter->filterSpan(src4b, N, dst4b);
         SkPM4f dst4f[N];
         filter->filterSpan4f(src4f, N, dst4f);
         REPORTER_ASSERT(reporter, compare_spans(dst4f, dst4b, N));
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ skipping 29 matching lines @@
 //
 DEF_TEST(Color4f_xfermode_proc4f, reporter) {
     // TODO: extend xfermodes so that all cases can be tested.
     //
     for (int mode = SkXfermode::kClear_Mode; mode <= SkXfermode::kScreen_Mode; ++mode) {
         SkXfermodeProc   proc32 = SkXfermode::GetProc((SkXfermode::Mode)mode);
         SkXfermodeProc4f proc4f = SkXfermode::GetProc4f((SkXfermode::Mode)mode);
         REPORTER_ASSERT(reporter, compare_procs(proc32, proc4f));
     }
 }