commit f3880933092c3226cd7ffd1690fe72c9c0cc376c
author Matt Sarett <msarett@google.com> Fri Mar 24 10:06:03 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Mar 24 17:11:26 2017 +0000
tree 893a45cb711edc327e1a450f1ce3cb2974a42528
parent 70288c0a9179f308fc7de1b07899baef4446e444

Delete SkColorSpace::ColorSpaceFlags

BUG=skia:

Change-Id: Ia0688876915cd773614ca0c4ccd467cf6e7c603e
Reviewed-on: https://skia-review.googlesource.com/10105
Commit-Queue: Matt Sarett <msarett@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

tests/ColorSpaceTest.cpp

diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp
index 059fa59..2eb7347 100644
--- a/tests/ColorSpaceTest.cpp
+++ b/tests/ColorSpaceTest.cpp
@@ -311,13 +311,6 @@
     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()));
-
-    sk_sp<SkColorSpace> srgbFlag =
-            SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma,
-                                  SkColorSpace::kSRGB_Gamut,
-                                  SkColorSpace::kNonLinearBlending_ColorSpaceFlag);
-    REPORTER_ASSERT(r, !SkColorSpace::Equals(srgb.get(), srgbFlag.get()));
-    REPORTER_ASSERT(r, SkColorSpace_Base::EqualsIgnoreFlags(srgb.get(), srgbFlag.get()));
 }
 
 static inline bool matrix_almost_equal(const SkMatrix44& a, const SkMatrix44& b) {
@@ -481,8 +474,6 @@
 
 DEF_TEST(ColorSpace_IsSRGB, r) {
     sk_sp<SkColorSpace> srgb0 = SkColorSpace::MakeSRGB();
-    sk_sp<SkColorSpace> srgb1 = SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma,
-            SkColorSpace::kSRGB_Gamut, SkColorSpace::kNonLinearBlending_ColorSpaceFlag);
 
     SkColorSpaceTransferFn fn;
     fn.fA = 1.0f;
@@ -495,6 +486,5 @@
     sk_sp<SkColorSpace> twoDotTwo = SkColorSpace::MakeRGB(fn, SkColorSpace::kSRGB_Gamut);
 
     REPORTER_ASSERT(r, srgb0->isSRGB());
-    REPORTER_ASSERT(r, srgb1->isSRGB());
     REPORTER_ASSERT(r, !twoDotTwo->isSRGB());
 }

tests/ColorSpaceXformTest.cpp

diff --git a/tests/ColorSpaceXformTest.cpp b/tests/ColorSpaceXformTest.cpp
index 03c8f49..f8a5c8f 100644
--- a/tests/ColorSpaceXformTest.cpp
+++ b/tests/ColorSpaceXformTest.cpp
@@ -23,7 +23,7 @@
     static std::unique_ptr<SkColorSpaceXform> CreateIdentityXform(const sk_sp<SkGammas>& gammas) {
         // Logically we can pass any matrix here.  For simplicty, pass I(), i.e. D50 XYZ gamut.
         sk_sp<SkColorSpace> space(new SkColorSpace_XYZ(
-                kNonStandard_SkGammaNamed, gammas, SkMatrix::I(), nullptr, 0 /* flags */));
+                kNonStandard_SkGammaNamed, gammas, SkMatrix::I(), nullptr));
 
         // Use special testing entry point, so we don't skip the xform, even though src == dst.
         return SlowIdentityXform(static_cast<SkColorSpace_XYZ*>(space.get()));
@@ -53,7 +53,7 @@
                                                     SkColorSpace_Base::kRGB_ICCTypeFlag,
                                                     std::move(srcElements));
         sk_sp<SkColorSpace> dstSpace(new SkColorSpace_XYZ(gammaNamed, gammas, arbitraryMatrix,
-                                                          nullptr, 0 /* flags */));
+                                                          nullptr));
 
         return SkColorSpaceXform::New(static_cast<SkColorSpace_A2B*>(srcSpace.get()),
                                       static_cast<SkColorSpace_XYZ*>(dstSpace.get()));

tests/ICCTest.cpp

diff --git a/tests/ICCTest.cpp b/tests/ICCTest.cpp
index e2f845c..5d541bd 100644
--- a/tests/ICCTest.cpp
+++ b/tests/ICCTest.cpp
@@ -161,7 +161,7 @@
     static sk_sp<SkICC> MakeICC(sk_sp<SkGammas> gammas) {
         return MakeICC(sk_sp<SkColorSpace>(new SkColorSpace_XYZ(
                 kNonStandard_SkGammaNamed, std::move(gammas),
-                SkMatrix44(SkMatrix44::kIdentity_Constructor), nullptr, 0 /* flags */)));
+                SkMatrix44(SkMatrix44::kIdentity_Constructor), nullptr)));
     }
 };