Add some actual data to 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/macros.h"
 #include "build/build_config.h"
 #include "ui/gfx/gfx_export.h"
 
 namespace IPC {
 template <class P>
 struct ParamTraits;
 }  // namespace IPC
 
 namespace gfx {
 
 class ICCProfile;
 
 // Used to represet a color space for the purpose of color conversion.
 // This is designed to be safe and compact enough to send over IPC
 // between any processes.
 class GFX_EXPORT ColorSpace {
  public:
+  enum PrimaryID : int16_t {

[ccameron, 2016/07/27 17:10:30]

nit: Please change this to

enum class Primary {
  RESERVED0
};

This way we can just say gfx::ColorSpace::Primary::BT709

[hubbe, 2016/07/27 17:44:04]

Done.
Although I'm still calling it PrimaryID, as I feel that is more descriptive.

+    // The first 0-255 values should match the H264 specification.
+    PRI_RESERVED0 = 0,
+    PRI_BT709 = 1,
+    PRI_UNSPECIFIED = 2,
+    PRI_RESERVED = 3,
+    PRI_BT470M = 4,
+    PRI_BT470BG = 5,
+    PRI_SMPTE170M = 6,
+    PRI_SMPTE240M = 7,
+    PRI_FILM = 8,
+    PRI_BT2020 = 9,
+    PRI_SMPTEST428_1 = 10,
+    PRI_SMPTEST431_2 = 11,
+    PRI_SMPTEST432_1 = 12,
+
+    // Chrome-specific values start at 1000.
+    PRI_XYZ_D50 = 1000,
+    // TODO(hubbe): We need to store the primaries.
+    PRI_CUSTOM = 1001,
+    PRI_LAST = PRI_XYZ_D50
+  };
+
+  enum TransferID : uint16_t {

[ccameron, 2016/07/27 17:10:30]

(same thing, "enum class TransferFunction", and no "TRC_" prefix).

[hubbe, 2016/07/27 17:44:04]

Done, but still calling it TransferID

+    // The first 0-255 values should match the H264 specification.
+    TRC_RESERVED0 = 0,
+    TRC_BT709 = 1,
+    TRC_UNSPECIFIED = 2,
+    TRC_RESERVED = 3,
+    TRC_GAMMA22 = 4,
+    TRC_GAMMA28 = 5,
+    TRC_SMPTE170M = 6,
+    TRC_SMPTE240M = 7,
+    TRC_LINEAR = 8,
+    TRC_LOG = 9,
+    TRC_LOG_SQRT = 10,
+    TRC_IEC61966_2_4 = 11,
+    TRC_BT1361_ECG = 12,
+    TRC_IEC61966_2_1 = 13,
+    TRC_BT2020_10 = 14,
+    TRC_BT2020_12 = 15,
+    TRC_SMPTEST2084 = 16,
+    TRC_SMPTEST428_1 = 17,
+
+    // Chrome-specific values start at 1000.
+    TRC_GAMMA24 = 1000,
+
+    // TODO(hubbe): Need to store an approximation of the gamma function(s).
+    TRC_CUSTOM = 1001,
+    TRC_LAST = TRC_GAMMA24,
+  };
+
+  enum MatrixID : int16_t {
+    // The first 0-255 values should match the H264 specification.

[ccameron, 2016/07/27 17:10:29]

(& again)

[hubbe, 2016/07/27 17:44:04]

Done.

+    SPC_RGB = 0,
+    SPC_BT709 = 1,
+    SPC_UNSPECIFIED = 2,
+    SPC_RESERVED = 3,
+    SPC_FCC = 4,
+    SPC_BT470BG = 5,
+    SPC_SMPTE170M = 6,
+    SPC_SMPTE240M = 7,
+    SPC_YCOCG = 8,
+    SPC_BT2020_NCL = 9,
+    SPC_BT2020_CL = 10,
+    SPC_YDZDX = 11,
+
+    // Chrome-specific values start at 1000
+    SPC_LAST = SPC_BT2020_CL
+  };
+
   ColorSpace();
+  ColorSpace(PrimaryID primaries,
+             TransferID transfer,
+             MatrixID matrix,
+             bool full_range);
+
+  bool isValid() const;

[ccameron, 2016/07/27 17:10:30]

Remove isValid cause it has no callers now (with the comments in IPCs).

We may need it in the future, but we'll have to be precise about its meaning
there.

[hubbe, 2016/07/27 17:44:04]

Done.

+
   static ColorSpace CreateSRGB();
 
   // TODO: Remove these, and replace with more generic constructors.
   static ColorSpace CreateJpeg();
   static ColorSpace CreateREC601();
   static ColorSpace CreateREC709();
 
   bool operator==(const ColorSpace& other) const;
 
  private:
-  bool valid_ = false;
+  PrimaryID primaries_;
+  TransferID transfer_;
+  MatrixID matrix_;
+
+  // TODO(hubbe): Range might be different depending on bit depth, if so,

[ccameron, 2016/07/27 17:10:30]

I'd go for putting this in an enum from the get-go.

[hubbe, 2016/07/27 17:44:04]

Done.

+  // convert this to an enum.
+  bool full_range_;
+
   // This is used to look up the ICCProfile from which this ColorSpace was
   // created, if possible.
   uint64_t icc_profile_id_ = 0;
 
   friend class ICCProfile;
   friend struct IPC::ParamTraits<gfx::ColorSpace>;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_COLOR_SPACE_H_