Remove SkColorSpace_Base::MakeNamed, along with most uses of Adobe RGB

Bug: skia:
Change-Id: If5935eac48184bc8cbe4db21dac4d6033a8704e6
Reviewed-on: https://skia-review.googlesource.com/84200
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>

5 files changed, 10 insertions, 86 deletions

diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp
index 5aa9f17e94..ff784baf0a 100644
--- a/tests/ColorSpaceTest.cpp
+++ b/tests/ColorSpaceTest.cpp
@@ -174,49 +174,6 @@ DEF_TEST(ColorSpaceSRGBLinearCompare, r) {
     REPORTER_ASSERT(r, strangeColorSpace != namedColorSpace);
 }
 
-DEF_TEST(ColorSpaceAdobeCompare, r) {
-    // Create an sRGB color space by name
-    sk_sp<SkColorSpace> namedColorSpace =
-            SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named);
-
-    // Create an sRGB color space by value
-    SkMatrix44 adobeToxyzD50(SkMatrix44::kUninitialized_Constructor);
-    adobeToxyzD50.set3x3RowMajorf(gAdobeRGB_toXYZD50);
-
-    SkColorSpaceTransferFn fn;
-    fn.fA = 1.0f;
-    fn.fB = 0.0f;
-    fn.fC = 0.0f;
-    fn.fD = 0.0f;
-    fn.fE = 0.0f;
-    fn.fF = 0.0f;
-    fn.fG = 2.2f;
-    sk_sp<SkColorSpace> rgbColorSpace = SkColorSpace::MakeRGB(fn, adobeToxyzD50);
-    REPORTER_ASSERT(r, rgbColorSpace == namedColorSpace);
-}
-
-DEF_TEST(ColorSpace_Named, r) {
-    const struct {
-        SkColorSpace_Base::Named fNamed;
-        SkGammaNamed             fExpectedGamma;
-    } recs[] {
-        { SkColorSpace_Base::kSRGB_Named,       kSRGB_SkGammaNamed },
-        { SkColorSpace_Base::kAdobeRGB_Named,   k2Dot2Curve_SkGammaNamed },
-        { SkColorSpace_Base::kSRGBLinear_Named, kLinear_SkGammaNamed },
-    };
-
-    for (auto rec : recs) {
-        auto cs = SkColorSpace_Base::MakeNamed(rec.fNamed);
-        REPORTER_ASSERT(r, cs);
-        if (cs) {
-            REPORTER_ASSERT(r, rec.fExpectedGamma == cs->gammaNamed());
-        }
-    }
-
-    SkImageInfo info = SkImageInfo::MakeS32(10, 10, kPremul_SkAlphaType);
-    REPORTER_ASSERT(r, info.gammaCloseToSRGB());
-}
-
 static void test_serialize(skiatest::Reporter* r, SkColorSpace* space, bool isNamed) {
     sk_sp<SkData> data1 = space->serialize();
 
@@ -238,7 +195,6 @@ static void test_serialize(skiatest::Reporter* r, SkColorSpace* space, bool isNa
 
 DEF_TEST(ColorSpace_Serialize, r) {
     test_serialize(r, SkColorSpace::MakeSRGB().get(), true);
-    test_serialize(r, SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named).get(), true);
     test_serialize(r, SkColorSpace::MakeSRGBLinear().get(), true);
 
     sk_sp<SkData> monitorData = GetResourceAsData("icc_profiles/HP_ZR30w.icc");
@@ -264,7 +220,6 @@ DEF_TEST(ColorSpace_Serialize, r) {
 
 DEF_TEST(ColorSpace_Equals, r) {
     sk_sp<SkColorSpace> srgb = SkColorSpace::MakeSRGB();
-    sk_sp<SkColorSpace> adobe = SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named);
     sk_sp<SkData> data = GetResourceAsData("icc_profiles/HP_ZR30w.icc");
     sk_sp<SkColorSpace> z30 = SkColorSpace::MakeICC(data->data(), data->size());
     data = GetResourceAsData("icc_profiles/HP_Z32x.icc");
@@ -287,7 +242,6 @@ DEF_TEST(ColorSpace_Equals, r) {
 
     REPORTER_ASSERT(r, SkColorSpace::Equals(nullptr, nullptr));
     REPORTER_ASSERT(r, SkColorSpace::Equals(srgb.get(), srgb.get()));
-    REPORTER_ASSERT(r, SkColorSpace::Equals(adobe.get(), adobe.get()));
     REPORTER_ASSERT(r, SkColorSpace::Equals(z30.get(), z30.get()));
     REPORTER_ASSERT(r, SkColorSpace::Equals(z32.get(), z32.get()));
     REPORTER_ASSERT(r, SkColorSpace::Equals(upperLeft.get(), upperLeft.get()));
@@ -296,13 +250,11 @@ DEF_TEST(ColorSpace_Equals, r) {
 
     REPORTER_ASSERT(r, !SkColorSpace::Equals(nullptr, srgb.get()));
     REPORTER_ASSERT(r, !SkColorSpace::Equals(srgb.get(), nullptr));
-    REPORTER_ASSERT(r, !SkColorSpace::Equals(adobe.get(), srgb.get()));
     REPORTER_ASSERT(r, !SkColorSpace::Equals(z30.get(), srgb.get()));
     REPORTER_ASSERT(r, !SkColorSpace::Equals(z32.get(), z30.get()));
     REPORTER_ASSERT(r, !SkColorSpace::Equals(upperLeft.get(), srgb.get()));
     REPORTER_ASSERT(r, !SkColorSpace::Equals(upperLeft.get(), upperRight.get()));
     REPORTER_ASSERT(r, !SkColorSpace::Equals(z30.get(), upperRight.get()));
-    REPORTER_ASSERT(r, !SkColorSpace::Equals(upperRight.get(), adobe.get()));
     REPORTER_ASSERT(r, !SkColorSpace::Equals(z30.get(), rgb4.get()));
     REPORTER_ASSERT(r, !SkColorSpace::Equals(srgb.get(), rgb4.get()));
 }
@@ -353,27 +305,6 @@ DEF_TEST(ColorSpace_Primaries, r) {
                                                       srgbToXYZ);
     REPORTER_ASSERT(r, SkColorSpace::MakeSRGB() == space);
 
-    // AdobeRGB primaries (D65)
-    SkColorSpacePrimaries adobe;
-    adobe.fRX = 0.64f;
-    adobe.fRY = 0.33f;
-    adobe.fGX = 0.21f;
-    adobe.fGY = 0.71f;
-    adobe.fBX = 0.15f;
-    adobe.fBY = 0.06f;
-    adobe.fWX = 0.3127f;
-    adobe.fWY = 0.3290f;
-    SkMatrix44 adobeToXYZ(SkMatrix44::kUninitialized_Constructor);
-    result = adobe.toXYZD50(&adobeToXYZ);
-    REPORTER_ASSERT(r, result);
-
-    SkColorSpaceTransferFn fn;
-    fn.fA = 1.0f;
-    fn.fB = fn.fC = fn.fD = fn.fE = fn.fF = 0.0f;
-    fn.fG = 2.2f;
-    space = SkColorSpace::MakeRGB(fn, adobeToXYZ);
-    REPORTER_ASSERT(r, SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named) == space);
-
     // ProPhoto (D50)
     SkColorSpacePrimaries proPhoto;
     proPhoto.fRX = 0.7347f;
diff --git a/tests/ColorSpaceXformTest.cpp b/tests/ColorSpaceXformTest.cpp
index 041796c5c4..db4ac44dc7 100644
--- a/tests/ColorSpaceXformTest.cpp
+++ b/tests/ColorSpaceXformTest.cpp
@@ -331,9 +331,10 @@ DEF_TEST(SkColorSpaceXform_LoadTail, r) {
     std::unique_ptr<uint64_t[]> srcPixel(new uint64_t[1]);
     srcPixel[0] = 0;
     uint32_t dstPixel;
-    sk_sp<SkColorSpace> adobe = SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named);
+    sk_sp<SkColorSpace> p3 = SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma,
+                                                   SkColorSpace::kDCIP3_D65_Gamut);
     sk_sp<SkColorSpace> srgb = SkColorSpace::MakeSRGB();
-    std::unique_ptr<SkColorSpaceXform> xform = SkColorSpaceXform::New(adobe.get(), srgb.get());
+    std::unique_ptr<SkColorSpaceXform> xform = SkColorSpaceXform::New(p3.get(), srgb.get());
 
     // ASAN will catch us if we read past the tail.
     bool success = xform->apply(SkColorSpaceXform::kRGBA_8888_ColorFormat, &dstPixel,
diff --git a/tests/ICCTest.cpp b/tests/ICCTest.cpp
index 4933155148..cfe4dc04a0 100644
--- a/tests/ICCTest.cpp
+++ b/tests/ICCTest.cpp
@@ -99,8 +99,7 @@ DEF_TEST(ICC_IsNumericalTransferFn, r) {
 }
 
 static inline void test_write_icc(skiatest::Reporter* r, const SkColorSpaceTransferFn& fn,
-                                  const SkMatrix44& toXYZD50, SkColorSpace* reference,
-                                  bool writeToFile) {
+                                  const SkMatrix44& toXYZD50, bool writeToFile) {
     sk_sp<SkData> profile = SkICC::WriteToICC(fn, toXYZD50);
     if (writeToFile) {
         SkFILEWStream stream("out.icc");
@@ -108,7 +107,8 @@ static inline void test_write_icc(skiatest::Reporter* r, const SkColorSpaceTrans
     }
 
     sk_sp<SkColorSpace> colorSpace = SkColorSpace::MakeICC(profile->data(), profile->size());
-    REPORTER_ASSERT(r, SkColorSpace::Equals(reference, colorSpace.get()));
+    sk_sp<SkColorSpace> reference = SkColorSpace::MakeRGB(fn, toXYZD50);
+    REPORTER_ASSERT(r, SkColorSpace::Equals(reference.get(), colorSpace.get()));
 }
 
 DEF_TEST(ICC_WriteICC, r) {
@@ -122,8 +122,9 @@ DEF_TEST(ICC_WriteICC, r) {
     adobeFn.fG = 2.2f;
     SkMatrix44 adobeMatrix(SkMatrix44::kUninitialized_Constructor);
     adobeMatrix.set3x3RowMajorf(gAdobeRGB_toXYZD50);
-    test_write_icc(r, adobeFn, adobeMatrix,
-                   SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named).get(), false);
+    // TODO: Restore this test once we fix our Adobe matrix to be based on the decoded ICC
+    // fixed point values, and once we use a rounding conversion to fixed-point.
+//    test_write_icc(r, adobeFn, adobeMatrix, false);
 
     SkColorSpaceTransferFn srgbFn;
     srgbFn.fA = 1.0f / 1.055f;
@@ -135,8 +136,7 @@ DEF_TEST(ICC_WriteICC, r) {
     srgbFn.fG = 2.4f;
     SkMatrix44 srgbMatrix(SkMatrix44::kUninitialized_Constructor);
     srgbMatrix.set3x3RowMajorf(gSRGB_toXYZD50);
-    test_write_icc(r, srgbFn, srgbMatrix, SkColorSpace::MakeSRGB().get(),
-                   false);
+    test_write_icc(r, srgbFn, srgbMatrix, false);
 
     SkString adobeTag = SkICCGetColorProfileTag(adobeFn, adobeMatrix);
     SkString srgbTag = SkICCGetColorProfileTag(srgbFn, srgbMatrix);
@@ -174,10 +174,6 @@ DEF_TEST(ICC_RawTransferFns, r) {
     sk_sp<SkICC> srgb = ICCTest::MakeICC(SkColorSpace::MakeSRGB());
     test_raw_transfer_fn(r, srgb.get());
 
-    sk_sp<SkICC> adobe =
-            ICCTest::MakeICC(SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named));
-    test_raw_transfer_fn(r, adobe.get());
-
     // Lookup-table based gamma curves
     constexpr size_t tableSize = 10;
     void* memory = sk_malloc_throw(sizeof(SkGammas) + sizeof(float) * tableSize);
diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp
index 38f9b6ae90..3850b4f112 100644
--- a/tests/ImageIsOpaqueTest.cpp
+++ b/tests/ImageIsOpaqueTest.cpp
@@ -52,7 +52,6 @@ DEF_TEST(ImageInfo_flattening, reporter) {
     sk_sp<SkColorSpace> spaces[] = {
         nullptr,
         SkColorSpace::MakeSRGB(),
-        SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named),
         space0,
         space1,
         space2,
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 942cd8f40d..4b5866466b 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -811,7 +811,6 @@ static void test_surface_creation_and_snapshot_with_color_space(
     std::function<sk_sp<SkSurface>(const SkImageInfo&)> surfaceMaker) {
 
     auto srgbColorSpace = SkColorSpace::MakeSRGB();
-    auto adobeColorSpace = SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named);
     const SkMatrix44* srgbMatrix = srgbColorSpace->toXYZD50();
     SkASSERT(srgbMatrix);
     SkColorSpaceTransferFn oddGamma;
@@ -830,12 +829,10 @@ static void test_surface_creation_and_snapshot_with_color_space(
         { kN32_SkColorType,       nullptr,          true,  "N32-nullptr" },
         { kN32_SkColorType,       linearColorSpace, false, "N32-linear"  },
         { kN32_SkColorType,       srgbColorSpace,   true,  "N32-srgb"    },
-        { kN32_SkColorType,       adobeColorSpace,  true,  "N32-adobe"   },
         { kN32_SkColorType,       oddColorSpace,    false, "N32-odd"     },
         { kRGBA_F16_SkColorType,  nullptr,          true,  "F16-nullptr" },
         { kRGBA_F16_SkColorType,  linearColorSpace, true,  "F16-linear"  },
         { kRGBA_F16_SkColorType,  srgbColorSpace,   false, "F16-srgb"    },
-        { kRGBA_F16_SkColorType,  adobeColorSpace,  false, "F16-adobe"   },
         { kRGBA_F16_SkColorType,  oddColorSpace,    false, "F16-odd"     },
         { kRGB_565_SkColorType,   srgbColorSpace,   false, "565-srgb"    },
         { kAlpha_8_SkColorType,   srgbColorSpace,   false, "A8-srgb"     },