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>

tools/flags/SkCommonFlagsConfig.cpp

diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp
index b9d6a5d..1e980d2 100644
--- a/tools/flags/SkCommonFlagsConfig.cpp
+++ b/tools/flags/SkCommonFlagsConfig.cpp
@@ -306,14 +306,10 @@
     }
 
     const bool linearGamma = commands[0].equals("f16");
-    const bool nonLinearBlending = commands[0].equals("srgbnl");
     SkColorSpace::Gamut gamut = SkColorSpace::kSRGB_Gamut;
     SkColorSpace::RenderTargetGamma gamma = linearGamma ? SkColorSpace::kLinear_RenderTargetGamma
                                                         : SkColorSpace::kSRGB_RenderTargetGamma;
-    SkColorSpace::ColorSpaceFlags flags =
-            nonLinearBlending ? SkColorSpace::kNonLinearBlending_ColorSpaceFlag
-                              : (SkColorSpace::ColorSpaceFlags) 0;
-    *outColorSpace = SkColorSpace::MakeRGB(gamma, gamut, flags);
+    *outColorSpace = SkColorSpace::MakeRGB(gamma, gamut);
 
     if (commands.count() == 2) {
         if (commands[1].equals("srgb")) {
@@ -327,7 +323,7 @@
             };
             SkMatrix44 wideGamutRGBMatrix(SkMatrix44::kUninitialized_Constructor);
             wideGamutRGBMatrix.set3x3RowMajorf(gWideGamutRGB_toXYZD50);
-            *outColorSpace = SkColorSpace::MakeRGB(gamma, wideGamutRGBMatrix, flags);
+            *outColorSpace = SkColorSpace::MakeRGB(gamma, wideGamutRGBMatrix);
         } else if (commands[1].equals("narrow")) {
             // NarrowGamut RGB (an artifically smaller than sRGB gamut)
             SkColorSpacePrimaries primaries ={
@@ -338,7 +334,7 @@
             };
             SkMatrix44 narrowGamutRGBMatrix(SkMatrix44::kUninitialized_Constructor);
             primaries.toXYZD50(&narrowGamutRGBMatrix);
-            *outColorSpace = SkColorSpace::MakeRGB(gamma, narrowGamutRGBMatrix, flags);
+            *outColorSpace = SkColorSpace::MakeRGB(gamma, narrowGamutRGBMatrix);
         } else {
             // Unknown color gamut
             return false;