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

tests/ColorMatrixTest.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 
 #include "SkBitmap.h"
@@ skipping 27 matching lines @@
     bitmap.allocN32Pixels(1,1);
 
     SkCanvas canvas(bitmap);
     SkPaint paint;
 
     SkScalar blueToCyan[20] = {
             1.0f, 0.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 1.0f, 1.0f, 0.0f, 0.0f,
             0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
             0.0f, 0.0f, 0.0f, 1.0f, 0.0f };
-    paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(blueToCyan));
+    paint.setColorFilter(SkColorMatrixFilter::Create(blueToCyan))->unref();
 
     paint.setColor(SK_ColorBLUE);
     canvas.drawPoint(0, 0, paint);
     assert_color(reporter, SK_ColorCYAN, bitmap.getColor(0, 0));
 
     paint.setColor(SK_ColorGREEN);
     canvas.drawPoint(0, 0, paint);
     assert_color(reporter, SK_ColorGREEN, bitmap.getColor(0, 0));
 
     paint.setColor(SK_ColorRED);
     canvas.drawPoint(0, 0, paint);
     assert_color(reporter, SK_ColorRED, bitmap.getColor(0, 0));
 
     // color components are clipped, not scaled
     paint.setColor(SK_ColorMAGENTA);
     canvas.drawPoint(0, 0, paint);
     assert_color(reporter, SK_ColorWHITE, bitmap.getColor(0, 0));
 
     SkScalar transparentRedAddBlue[20] = {
             1.0f, 0.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 1.0f, 0.0f, 0.0f, 0.0f,
             0.0f, 0.0f, 1.0f, 0.0f, 64.0f,
            -0.5f, 0.0f, 0.0f, 1.0f, 0.0f
     };
-    paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(transparentRedAddBlue));
+    paint.setColorFilter(SkColorMatrixFilter::Create(transparentRedAddBlue))->unref();
     bitmap.eraseColor(SK_ColorTRANSPARENT);
 
     paint.setColor(SK_ColorRED);
     canvas.drawPoint(0, 0, paint);
     assert_color(reporter, SkColorSetARGB(128, 255, 0, 64), bitmap.getColor(0, 0), 2);
 
     paint.setColor(SK_ColorCYAN);
     canvas.drawPoint(0, 0, paint);
     // blue gets clipped
     assert_color(reporter, SK_ColorCYAN, bitmap.getColor(0, 0));
 
     // change array to filter out green
     REPORTER_ASSERT(reporter, 1.0f == transparentRedAddBlue[6]);
     transparentRedAddBlue[6] = 0.0f;
 
     // check that changing the array has no effect
     canvas.drawPoint(0, 0, paint);
     assert_color(reporter, SK_ColorCYAN, bitmap.getColor(0, 0));
 
     // create a new filter with the changed matrix
-    paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(transparentRedAddBlue));
+    paint.setColorFilter(SkColorMatrixFilter::Create(transparentRedAddBlue))->unref();
     canvas.drawPoint(0, 0, paint);
     assert_color(reporter, SK_ColorBLUE, bitmap.getColor(0, 0));
 }
 
 DEF_TEST(ColorMatrix, reporter) {
     test_colorMatrixCTS(reporter);
 }