Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(808)

Unified Diff: ui/gfx/ipc/color/gfx_param_traits.cc

Issue 2183953002: Add some actual data to gfx::ColorSpace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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" -- unconditiona
hubbe 2016/07/27 17:44:04 The intention is to only read/encode the matrix if
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;
}

Powered by Google App Engine
This is Rietveld 408576698