Always use valid enum values in gfx::ColorSpace

ui/gfx/color_space.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_GFX_COLOR_SPACE_H_
 #define UI_GFX_COLOR_SPACE_H_
 
 #include <stdint.h>
 
 #include "base/gtest_prod_util.h"
@@ skipping 25 matching lines @@
     BT470M = 4,
     BT470BG = 5,
     SMPTE170M = 6,
     SMPTE240M = 7,
     FILM = 8,
     BT2020 = 9,
     SMPTEST428_1 = 10,
     SMPTEST431_2 = 11,
     SMPTEST432_1 = 12,
 
+    LAST_STANDARD_VALUE = SMPTEST432_1,
+
     // Chrome-specific values start at 1000.
-    XYZ_D50 = 1000,
-    // TODO(hubbe): We need to store the primaries.
-    CUSTOM = 1001,
-    LAST = CUSTOM
+    UNKNOWN = 1000,
+    XYZ_D50,
+    CUSTOM,
+    LAST = UNKNOWN

[ccameron, 2016/09/16 23:09:48]

Should this be CUSTOM?

[hubbe, 2016/09/16 23:25:35]

Ooops, yes, I rearranged it so that UNKNOWN is always 1000, but then missed
this.

   };
 
   enum class TransferID : uint16_t {
     // The first 0-255 values should match the H264 specification.
     RESERVED0 = 0,
     BT709 = 1,
     UNSPECIFIED = 2,
     RESERVED = 3,
     GAMMA22 = 4,
     GAMMA28 = 5,
     SMPTE170M = 6,
     SMPTE240M = 7,
     LINEAR = 8,
     LOG = 9,
     LOG_SQRT = 10,
     IEC61966_2_4 = 11,
     BT1361_ECG = 12,
     IEC61966_2_1 = 13,
     BT2020_10 = 14,
     BT2020_12 = 15,
     SMPTEST2084 = 16,
     SMPTEST428_1 = 17,
 
+    LAST_STANDARD_VALUE = SMPTEST428_1,
+
     // Chrome-specific values start at 1000.
-    GAMMA24 = 1000,
+    UNKNOWN = 1000,
+    GAMMA24,
 
     // This is an ad-hoc transfer function that decodes SMPTE 2084 content
     // into a 0-1 range more or less suitable for viewing on a non-hdr
     // display.
     SMPTEST2084_NON_HDR,
 
     // TODO(hubbe): Need to store an approximation of the gamma function(s).
     CUSTOM,
     LAST = CUSTOM,
   };
 
   enum class MatrixID : int16_t {
     // The first 0-255 values should match the H264 specification.
     RGB = 0,
     BT709 = 1,
     UNSPECIFIED = 2,
     RESERVED = 3,
     FCC = 4,
     BT470BG = 5,
     SMPTE170M = 6,
     SMPTE240M = 7,
     YCOCG = 8,
     BT2020_NCL = 9,
     BT2020_CL = 10,
     YDZDX = 11,
 
+    LAST_STANDARD_VALUE = YDZDX,
+
     // Chrome-specific values start at 1000
-    LAST = YDZDX,
+    UNKNOWN = 1000,
+    LAST = UNKNOWN,
   };
 
   // The h264 spec declares this as bool, so only the the first two values
   // correspond to the h264 spec. Chrome-specific values can start at 2.
   // We use an enum instead of a bool becuase different bit depths may have
   // different definitions of what "limited" means.
   enum class RangeID : int8_t {
     FULL = 0,
     LIMITED = 1,
 
     LAST = LIMITED
   };
 
   ColorSpace();
   ColorSpace(PrimaryID primaries,
              TransferID transfer,
              MatrixID matrix,
              RangeID full_range);
+  ColorSpace(int primaries, int transfer, int matrix, RangeID full_range);
+
+  static PrimaryID PrimaryIDFromInt(int primary_id);
+  static TransferID TransferIDFromInt(int transfer_id);
+  static MatrixID MatrixIDFromInt(int matrix_id);
 
   static ColorSpace CreateSRGB();
   static ColorSpace CreateXYZD50();
 
   // TODO: Remove these, and replace with more generic constructors.
   static ColorSpace CreateJpeg();
   static ColorSpace CreateREC601();
   static ColorSpace CreateREC709();
 
   bool operator==(const ColorSpace& other) const;
@@ skipping 15 matching lines @@
 
   friend class ICCProfile;
   friend class ColorSpaceToColorSpaceTransform;
   friend struct IPC::ParamTraits<gfx::ColorSpace>;
   FRIEND_TEST_ALL_PREFIXES(SimpleColorSpace, GetColorSpace);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_COLOR_SPACE_H_