remove experimental treat-skcolor-as-srgb flag

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 "SkBitmapProcShader.h"
 #include "SkColor.h"
 #include "SkColorMatrixFilter.h"
@@ skipping 25 matching lines @@
     const struct {
         SkColor     fC;
         SkColor4f   fC4;
     } recs[] = {
         { SK_ColorBLACK, { 0, 0, 0, 1 } },
         { SK_ColorWHITE, { 1, 1, 1, 1 } },
         { SK_ColorRED,   { 1, 0, 0, 1 } },
         { SK_ColorGREEN, { 0, 1, 0, 1 } },
         { SK_ColorBLUE,  { 0, 0, 1, 1 } },
         { 0,             { 0, 0, 0, 0 } },
-        { 0x55AAFF00,    { 2/3.0f, 1, 0, 1 / 3.0f } },
     };
 
     for (const auto& r : recs) {
         SkColor4f c4 = SkColor4f::FromColor(r.fC);
         REPORTER_ASSERT(reporter, c4 == r.fC4);
     }
 }
 
 DEF_TEST(Color4f_premul, reporter) {
     SkRandom rand;
@@ skipping 33 matching lines @@
         0,    0,    1, 0, -0.1f,
         0,    0,    0, 1, 0,
     };
     return SkColorFilter::MakeMatrixFilterRowMajor255(mx);
 }
 
 static sk_sp<SkColorFilter> make_compose_cf() {
     return SkColorFilter::MakeComposeFilter(make_mode_cf(), make_mx_cf());
 }
 
-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());
-}
-
 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;
         }
     }
     return true;
 }
 
-DEF_TEST(Color4f_shader, reporter) {
-    struct {
-        sk_sp<SkShader> (*fFact)();
-        bool            fSupports4f;
-        float           fTolerance;
-    } recs[] = {
-        { make_color_sh, true,  1.0f/255   },
-        // PMColor 4f gradients are interpolated in 255-multiplied values, so we need a
-        // slightly relaxed tolerance to accommodate the cumulative precision deviation.
-        { make_grad_sh,  true,  1.001f/255 },
-        { make_image_sh, false, 1.0f/255   },
-        { make_cf_sh,    true,  1.0f/255   },
-    };
-
-    SkPaint paint;
-    for (const auto& rec : recs) {
-        uint32_t storage[kSkBlitterContextSize];
-        paint.setShader(rec.fFact());
-        // Encourage 4f context selection. At some point we may need
-        // to instantiate two separate contexts for optimal 4b/4f selection.
-        const SkShader::ContextRec contextRec(paint, SkMatrix::I(), nullptr,
-                                              SkShader::ContextRec::kPM4f_DstType);
-        SkASSERT(paint.getShader()->contextSize(contextRec) <= sizeof(storage));
-        SkShader::Context* ctx = paint.getShader()->createContext(contextRec, storage);
-        if (rec.fSupports4f) {
-            const int N = 100;
-            SkPM4f buffer4f[N];
-            ctx->shadeSpan4f(0, 0, buffer4f, N);
-            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;
     } recs[] = {
         { make_mode_cf,     true, "mode" },
         { make_mx_cf,       true, "matrix" },
         { make_compose_cf,  true, "compose" },
     };
@@ skipping 54 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));
     }
 }