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

tests/ColorFilterTest.cpp

 /*
  * Copyright 2011 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 "SkColorFilter.h"
 #include "SkColorPriv.h"
 #include "SkLumaColorFilter.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkRandom.h"
 #include "SkXfermode.h"
 #include "Test.h"
 
-static SkColorFilter* reincarnate_colorfilter(SkFlattenable* obj) {
+static sk_sp<SkColorFilter> reincarnate_colorfilter(SkFlattenable* obj) {
     SkWriteBuffer wb;
     wb.writeFlattenable(obj);
 
     size_t size = wb.bytesWritten();
     SkAutoSMalloc<1024> storage(size);
     // make a copy into storage
     wb.writeToMemory(storage.get());
 
     SkReadBuffer rb(storage.get(), size);
     return rb.readColorFilter();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkColorFilter* make_filter() {
+static sk_sp<SkColorFilter> make_filter() {
     // pick a filter that cannot compose with itself via newComposed()
-    return SkColorFilter::CreateModeFilter(SK_ColorRED, SkXfermode::kColorBurn_Mode);
+    return SkColorFilter::MakeModeFilter(SK_ColorRED, SkXfermode::kColorBurn_Mode);
 }
 
 static void test_composecolorfilter_limit(skiatest::Reporter* reporter) {
     // Test that CreateComposeFilter() has some finite limit (i.e. that the factory can return null)
     const int way_too_many = 100;
-    SkAutoTUnref<SkColorFilter> parent(make_filter());
+    auto parent(make_filter());
     for (int i = 2; i < way_too_many; ++i) {
-        SkAutoTUnref<SkColorFilter> filter(make_filter());
-        parent.reset(SkColorFilter::CreateComposeFilter(parent, filter));
+        auto filter(make_filter());
+        parent = SkColorFilter::MakeComposeFilter(parent, filter);
         if (nullptr == parent) {
             REPORTER_ASSERT(reporter, i > 2); // we need to have succeeded at least once!
             return;
         }
     }
     REPORTER_ASSERT(reporter, false); // we never saw a nullptr :(
 }
 
 #define ILLEGAL_MODE    ((SkXfermode::Mode)-1)
 
 DEF_TEST(ColorFilter, reporter) {
     SkRandom rand;
 
     for (int mode = 0; mode <= SkXfermode::kLastMode; mode++) {
         SkColor color = rand.nextU();
 
         // ensure we always get a filter, by avoiding the possibility of a
         // special case that would return nullptr (if color's alpha is 0 or 0xFF)
         color = SkColorSetA(color, 0x7F);
 
-        SkColorFilter* cf = SkColorFilter::CreateModeFilter(color,
-                                                        (SkXfermode::Mode)mode);
+        auto cf = SkColorFilter::MakeModeFilter(color, (SkXfermode::Mode)mode);
 
         // allow for no filter if we're in Dst mode (its a no op)
         if (SkXfermode::kDst_Mode == mode && nullptr == cf) {
             continue;
         }
 
-        SkAutoUnref aur(cf);
         REPORTER_ASSERT(reporter, cf);
 
         SkColor c = ~color;
         SkXfermode::Mode m = ILLEGAL_MODE;
 
         SkColor expectedColor = color;
         SkXfermode::Mode expectedMode = (SkXfermode::Mode)mode;
 
 //        SkDebugf("--- mc [%d %x] ", mode, color);
 
         REPORTER_ASSERT(reporter, cf->asColorMode(&c, &m));
         // handle special-case folding by the factory
         if (SkXfermode::kClear_Mode == mode) {
             if (c != expectedColor) {
                 expectedColor = 0;
             }
             if (m != expectedMode) {
                 expectedMode = SkXfermode::kSrc_Mode;
             }
         }
 
 //        SkDebugf("--- got [%d %x] expected [%d %x]\n", m, c, expectedMode, expectedColor);
 
         REPORTER_ASSERT(reporter, c == expectedColor);
         REPORTER_ASSERT(reporter, m == expectedMode);
 
         {
-            SkColorFilter* cf2 = reincarnate_colorfilter(cf);
-            SkAutoUnref aur2(cf2);
+            auto cf2 = reincarnate_colorfilter(cf.get());
             REPORTER_ASSERT(reporter, cf2);
 
             SkColor c2 = ~color;
             SkXfermode::Mode m2 = ILLEGAL_MODE;
             REPORTER_ASSERT(reporter, cf2->asColorMode(&c2, &m2));
             REPORTER_ASSERT(reporter, c2 == expectedColor);
             REPORTER_ASSERT(reporter, m2 == expectedMode);
         }
     }
 
     test_composecolorfilter_limit(reporter);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_TEST(LumaColorFilter, reporter) {
     SkPMColor in, out;
-    SkAutoTUnref<SkColorFilter> lf(SkLumaColorFilter::Create());
+    auto lf(SkLumaColorFilter::Make());
 
     // Applying luma to white produces black with the same transparency.
     for (unsigned i = 0; i < 256; ++i) {
         in = SkPackARGB32(i, i, i, i);
         lf->filterSpan(&in, 1, &out);
         REPORTER_ASSERT(reporter, SkGetPackedA32(out) == i);
         REPORTER_ASSERT(reporter, SkGetPackedR32(out) == 0);
         REPORTER_ASSERT(reporter, SkGetPackedG32(out) == 0);
         REPORTER_ASSERT(reporter, SkGetPackedB32(out) == 0);
     }
@@ skipping 45 matching lines @@
     
     matrix[10] = 0.2126f - 0.2126f * amount;
     matrix[11] = 0.7152f - 0.7152f * amount;
     matrix[12] = 1.f - (matrix[10] + matrix[11]);
     matrix[13] = matrix[14] = 0.f;
     
     matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0.f;
     matrix[18] = 1.f;
 }
 
-static SkColorFilter* make_cf0() {
+static sk_sp<SkColorFilter> make_cf0() {
     SkScalar matrix[20];
     get_brightness_matrix(0.5f, matrix);
-    return SkColorMatrixFilter::Create(matrix);
+    return SkColorFilter::MakeMatrixFilterRowMajor255(matrix);
 }
-static SkColorFilter* make_cf1() {
+static sk_sp<SkColorFilter> make_cf1() {
     SkScalar matrix[20];
     get_grayscale_matrix(1, matrix);
-    return SkColorMatrixFilter::Create(matrix);
+    return SkColorFilter::MakeMatrixFilterRowMajor255(matrix);
 }
-static SkColorFilter* make_cf2() {
+static sk_sp<SkColorFilter> make_cf2() {
     SkColorMatrix m0, m1;
     get_brightness_matrix(0.5f, m0.fMat);
     get_grayscale_matrix(1, m1.fMat);
     m0.preConcat(m1);
-    return SkColorMatrixFilter::Create(m0);
+    return SkColorFilter::MakeMatrixFilterRowMajor255(m0.fMat);
 }
-static SkColorFilter* make_cf3() {
+static sk_sp<SkColorFilter> make_cf3() {
     SkColorMatrix m0, m1;
     get_brightness_matrix(0.5f, m0.fMat);
     get_grayscale_matrix(1, m1.fMat);
     m0.postConcat(m1);
-    return SkColorMatrixFilter::Create(m0);
+    return SkColorFilter::MakeMatrixFilterRowMajor255(m0.fMat);
 }
-typedef SkColorFilter* (*CFProc)();
+typedef sk_sp<SkColorFilter> (*CFProc)();
 
 // Test that a colormatrix that "should" preserve opaquness actually does.
 DEF_TEST(ColorMatrixFilter, reporter) {
     const CFProc procs[] = {
         make_cf0, make_cf1, make_cf2, make_cf3,
     };
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(procs); ++i) {
-        SkAutoTUnref<SkColorFilter> cf(procs[i]());
+        auto cf(procs[i]());
 
         // generate all possible r,g,b triples
         for (int r = 0; r < 256; ++r) {
             for (int g = 0; g < 256; ++g) {
                 SkPMColor storage[256];
                 for (int b = 0; b < 256; ++b) {
                     storage[b] = SkPackARGB32(0xFF, r, g, b);
                 }
                 cf->filterSpan(storage, 256, storage);
                 for (int b = 0; b < 256; ++b) {
                     REPORTER_ASSERT(reporter, 0xFF == SkGetPackedA32(storage[b]));
                 }
             }
         }
     }
 }