| 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..52c69768d8a5f29a7d0773d13311ea04be6757bc 100644
|
| --- a/ui/gfx/ipc/color/gfx_param_traits.cc
|
| +++ b/ui/gfx/ipc/color/gfx_param_traits.cc
|
| @@ -11,30 +11,36 @@ namespace IPC {
|
|
|
| void ParamTraits<gfx::ColorSpace>::GetSize(base::PickleSizer* s,
|
| const gfx::ColorSpace& p) {
|
| - GetParamSize(s, p.valid_);
|
| - if (!p.valid_)
|
| - return;
|
| + GetParamSize(s, p.primaries_);
|
| + GetParamSize(s, p.transfer_);
|
| + GetParamSize(s, p.matrix_);
|
| + GetParamSize(s, p.range_);
|
| 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_)
|
| - return;
|
| + WriteParam(m, p.primaries_);
|
| + WriteParam(m, p.transfer_);
|
| + WriteParam(m, p.matrix_);
|
| + WriteParam(m, p.range_);
|
| WriteParam(m, p.icc_profile_id_);
|
| }
|
|
|
| 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 (!ReadParam(m, iter, &r->transfer_))
|
| + return false;
|
| + if (!ReadParam(m, iter, &r->matrix_))
|
| + return false;
|
| + if (!ReadParam(m, iter, &r->range_))
|
| return false;
|
| - if (!r->valid_)
|
| - return true;
|
| -
|
| if (!ReadParam(m, iter, &r->icc_profile_id_))
|
| return false;
|
| +
|
| return true;
|
| }
|
|
|
|
|