Add some actual data to gfx::ColorSpace

ui/gfx/ipc/color/gfx_param_traits.cc

Index: ui/gfx/ipc/color/gfx_param_traits.cc
diff --git a/ui/gfx/ipc/color/gfx_param_traits.cc b/ui/gfx/ipc/color/gfx_param_traits.cc
index abf6054dcf1555bb05de1e5a6e6ef587ffc996f7..43b75bec741fe7508998eb86e2e8bed32ff77c9d 100644
--- a/ui/gfx/ipc/color/gfx_param_traits.cc
+++ b/ui/gfx/ipc/color/gfx_param_traits.cc
@@ -11,16 +11,22 @@ namespace IPC {
 
 void ParamTraits<gfx::ColorSpace>::GetSize(base::PickleSizer* s,
                                            const gfx::ColorSpace& p) {
-  GetParamSize(s, p.valid_);
-  if (!p.valid_)
+  GetParamSize(s, p.primaries_);
+  GetParamSize(s, p.transfer_);
+  GetParamSize(s, p.matrix_);
+  GetParamSize(s, p.full_range_);
+  if (!p.isValid())
     return;

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

Just remove the "if is valid part" -- unconditionally read icc_profile_id_

I put the conditional there to elide reading the 4x3 matrix, back when it was
there. We can re-add it if it matters.

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

The intention is to only read/encode the matrix if primaries is
PrimaryID::CUSTOM

   GetParamSize(s, p.icc_profile_id_);
 }
 
 void ParamTraits<gfx::ColorSpace>::Write(base::Pickle* m,
                                          const gfx::ColorSpace& p) {
-  WriteParam(m, p.valid_);
-  if (!p.valid_)
+  WriteParam(m, p.primaries_);
+  WriteParam(m, p.transfer_);
+  WriteParam(m, p.matrix_);
+  WriteParam(m, p.full_range_);
+  if (!p.isValid())
     return;
   WriteParam(m, p.icc_profile_id_);
 }
@@ -28,13 +34,21 @@ void ParamTraits<gfx::ColorSpace>::Write(base::Pickle* m,
 bool ParamTraits<gfx::ColorSpace>::Read(const base::Pickle* m,
                                         base::PickleIterator* iter,
                                         gfx::ColorSpace* r) {
-  if (!ReadParam(m, iter, &r->valid_))
+  if (!ReadParam(m, iter, &r->primaries_))
     return false;
-  if (!r->valid_)
+  if (!ReadParam(m, iter, &r->transfer_))
+    return false;
+  if (!ReadParam(m, iter, &r->matrix_))
+    return false;
+  if (!ReadParam(m, iter, &r->full_range_))
+    return false;
+
+  if (!r->isValid())
     return true;
 
   if (!ReadParam(m, iter, &r->icc_profile_id_))
     return false;
+
   return true;
 }