add 4f support to colorfiltershader

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 59 matching lines @@
         pm4 = c4.premul();
         REPORTER_ASSERT(reporter, pm4.fVec[SK_A_INDEX] == c4.fA);
         REPORTER_ASSERT(reporter, nearly_equal(pm4.fVec[SK_R_INDEX], c4.fA * c4.fR));
         REPORTER_ASSERT(reporter, nearly_equal(pm4.fVec[SK_G_INDEX], c4.fA * c4.fG));
         REPORTER_ASSERT(reporter, nearly_equal(pm4.fVec[SK_B_INDEX], c4.fA * c4.fB));
     }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
-static SkShader* make_color() { return SkShader::CreateColorShader(0xFFBB8855); }
+static SkColorFilter* make_mode_cf() {
+    return SkColorFilter::CreateModeFilter(0xFFBB8855, SkXfermode::kPlus_Mode);
+}
 
-static SkShader* make_image() {
+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 SkColorMatrixFilter::Create(mx);
+}
+
+static SkColorFilter* make_compose_cf() {
+    SkAutoTUnref<SkColorFilter> cf0(make_mode_cf());
+    SkAutoTUnref<SkColorFilter> cf1(make_mx_cf());
+    return SkColorFilter::CreateComposeFilter(cf0, cf1);
+}
+
+static SkShader* make_color_sh() { return SkShader::CreateColorShader(0xFFBB8855); }
+
+static 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),
     };
     SkAutoTUnref<SkImage> image(SkImage::NewRasterCopy(info, pixels, sizeof(SkPMColor) * 2));
     return image->newShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
 }
 
-static SkShader* make_grad() {
+static SkShader* make_grad_sh() {
     const SkPoint pts[] {{ 0, 0 }, { 100, 100 }};
     const SkColor colors[] { SK_ColorRED, SK_ColorBLUE };
     return SkGradientShader::CreateLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode);
 }
 
+static SkShader* make_cf_sh() {
+    SkAutoTUnref<SkColorFilter> filter(make_mx_cf());
+    SkAutoTUnref<SkShader> shader(make_color_sh());
+    return shader->newWithColorFilter(filter);
+}
+
 static void compare_spans(const SkPM4f span4f[], const SkPMColor span4b[], int count,
                           skiatest::Reporter* reporter) {
     for (int i = 0; i < count; ++i) {
         SkPM4f c0 = SkPM4f::FromPMColor(span4b[i]);
         SkPM4f c1 = span4f[i];
         REPORTER_ASSERT(reporter, nearly_equal(c0, c1, 1.0f/255));
     }
 }
 
 DEF_TEST(Color4f_shader, reporter) {
     struct {
         SkShader*   (*fFact)();
         bool        fSupports4f;
     } recs[] = {
-        { make_color, true },
-        { make_grad,  false },
-        { make_image, false },
+        { make_color_sh, true },
+        { make_grad_sh,  false },
+        { make_image_sh, false },
+        { make_cf_sh,    true },
     };
 
     SkPaint paint;
     for (const auto& rec : recs) {
         uint32_t storage[200];
         paint.setShader(rec.fFact())->unref();
         SkASSERT(paint.getShader()->contextSize() <= sizeof(storage));
         SkShader::Context* ctx = paint.getShader()->createContext({paint, SkMatrix::I(), nullptr},
                                                                   storage);
         REPORTER_ASSERT(reporter, ctx->supports4f() == rec.fSupports4f);
         if (ctx->supports4f()) {
             const int N = 100;
             SkPM4f buffer4f[N];
             ctx->shadeSpan4f(0, 0, buffer4f, N);
             SkPMColor buffer4b[N];
             ctx->shadeSpan(0, 0, buffer4b, N);
             compare_spans(buffer4f, buffer4b, N, reporter);
         }
         ctx->~Context();
     }
 }
 
-static SkColorFilter* make_mode_cf() {
-    return SkColorFilter::CreateModeFilter(0xFFBB8855, SkXfermode::kPlus_Mode);
-}
-
-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 SkColorMatrixFilter::Create(mx);
-}
-
-static SkColorFilter* make_compose_cf() {
-    SkAutoTUnref<SkColorFilter> cf0(make_mode_cf());
-    SkAutoTUnref<SkColorFilter> cf1(make_mx_cf());
-    return SkColorFilter::CreateComposeFilter(cf0, cf1);
-}
-
 DEF_TEST(Color4f_colorfilter, reporter) {
     struct {
         SkColorFilter* (*fFact)();
         bool           fSupports4f;
     } recs[] = {
         { make_mode_cf,     false },
         { make_mx_cf,       true },
         { make_compose_cf,  false },
     };
 
@@ skipping 14 matching lines @@
         REPORTER_ASSERT(reporter, filter->supports4f() == rec.fSupports4f);
         if (filter->supports4f()) {
             SkPMColor dst4b[N];
             filter->filterSpan(src4b, N, dst4b);
             SkPM4f dst4f[N];
             filter->filterSpan4f(src4f, N, dst4f);
             compare_spans(dst4f, dst4b, N, reporter);
         }
     }
 }