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

bench/ColorFilterBench.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "SkCanvas.h"
 #include "SkColorFilterImageFilter.h"
@@ skipping 16 matching lines @@
         return isSmall() ? SkRect::MakeWH(FILTER_WIDTH_SMALL, FILTER_HEIGHT_SMALL) :
                            SkRect::MakeWH(FILTER_WIDTH_LARGE, FILTER_HEIGHT_LARGE);
     }
 
     static SkImageFilter* make_brightness(float amount, SkImageFilter* input = nullptr) {
         SkScalar amount255 = SkScalarMul(amount, SkIntToScalar(255));
         SkScalar matrix[20] = { 1, 0, 0, 0, amount255,
                                 0, 1, 0, 0, amount255,
                                 0, 0, 1, 0, amount255,
                                 0, 0, 0, 1, 0 };
-        SkAutoTUnref<SkColorFilter> filter(SkColorMatrixFilter::Create(matrix));
-        return SkColorFilterImageFilter::Create(filter, input);
+        auto filter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
+        return SkColorFilterImageFilter::Create(filter.get(), input);
     }
 
     static SkImageFilter* make_grayscale(SkImageFilter* input = nullptr) {
         SkScalar matrix[20];
         memset(matrix, 0, 20 * sizeof(SkScalar));
         matrix[0] = matrix[5] = matrix[10] = 0.2126f;
         matrix[1] = matrix[6] = matrix[11] = 0.7152f;
         matrix[2] = matrix[7] = matrix[12] = 0.0722f;
         matrix[18] = 1.0f;
-        SkAutoTUnref<SkColorFilter> filter(SkColorMatrixFilter::Create(matrix));
-        return SkColorFilterImageFilter::Create(filter, input);
+        auto filter(SkColorFilter::MakeMatrixFilterRowMajor255(matrix));
+        return SkColorFilterImageFilter::Create(filter.get(), input);
     }
 
     static SkImageFilter* make_mode_blue(SkImageFilter* input = nullptr) {
-        SkAutoTUnref<SkColorFilter> filter(
-            SkColorFilter::CreateModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
-        return SkColorFilterImageFilter::Create(filter, input);
+        auto filter(SkColorFilter::MakeModeFilter(SK_ColorBLUE, SkXfermode::kSrcIn_Mode));
+        return SkColorFilterImageFilter::Create(filter.get(), input);
     }
 
     inline bool isSmall() const { return fIsSmall; }
 
 private:
     bool fIsSmall;
 
     typedef Benchmark INHERITED;
 };
 
@@ skipping 224 matching lines @@
 DEF_BENCH( return new ColorFilterGrayBench(true); )
 
 DEF_BENCH( return new ColorFilterDimBrightBench(false); )
 DEF_BENCH( return new ColorFilterBrightGrayBench(false); )
 DEF_BENCH( return new ColorFilterGrayBrightBench(false); )
 DEF_BENCH( return new ColorFilterBlueBrightBench(false); )
 DEF_BENCH( return new ColorFilterBrightBlueBench(false); )
 DEF_BENCH( return new ColorFilterBrightBench(false); )
 DEF_BENCH( return new ColorFilterBlueBench(false); )
 DEF_BENCH( return new ColorFilterGrayBench(false); )