| Index: cc/ipc/cc_param_traits.cc
|
| diff --git a/cc/ipc/cc_param_traits.cc b/cc/ipc/cc_param_traits.cc
|
| index 40066124e7cabdc2e78ea2af056f178b1857f379..216af8f2d148f31d6fc6031c06b52b4583ae26ba 100644
|
| --- a/cc/ipc/cc_param_traits.cc
|
| +++ b/cc/ipc/cc_param_traits.cc
|
| @@ -718,6 +718,48 @@ void ParamTraits<cc::SurfaceId>::Log(const param_type& p, std::string* l) {
|
| l->append(")");
|
| }
|
|
|
| +void ParamTraits<cc::SurfaceInfo>::GetSize(base::PickleSizer* s,
|
| + const param_type& p) {
|
| + GetParamSize(s, p.id());
|
| + GetParamSize(s, p.device_scale_factor());
|
| + GetParamSize(s, p.size_in_pixels());
|
| +}
|
| +
|
| +void ParamTraits<cc::SurfaceInfo>::Write(base::Pickle* m, const param_type& p) {
|
| + WriteParam(m, p.id());
|
| + WriteParam(m, p.device_scale_factor());
|
| + WriteParam(m, p.size_in_pixels());
|
| +}
|
| +
|
| +bool ParamTraits<cc::SurfaceInfo>::Read(const base::Pickle* m,
|
| + base::PickleIterator* iter,
|
| + param_type* p) {
|
| + cc::SurfaceId surface_id;
|
| + if (!ReadParam(m, iter, &surface_id))
|
| + return false;
|
| +
|
| + float device_scale_factor;
|
| + if (!ReadParam(m, iter, &device_scale_factor))
|
| + return false;
|
| +
|
| + gfx::Size size_in_pixels;
|
| + if (!ReadParam(m, iter, &size_in_pixels))
|
| + return false;
|
| +
|
| + *p = cc::SurfaceInfo(surface_id, device_scale_factor, size_in_pixels);
|
| + return p->is_valid();
|
| +}
|
| +
|
| +void ParamTraits<cc::SurfaceInfo>::Log(const param_type& p, std::string* l) {
|
| + l->append("SurfaceInfo(");
|
| + LogParam(p.id(), l);
|
| + l->append(", ");
|
| + LogParam(p.device_scale_factor(), l);
|
| + l->append(", ");
|
| + LogParam(p.size_in_pixels(), l);
|
| + l->append(")");
|
| +}
|
| +
|
| void ParamTraits<cc::CompositorFrame>::Write(base::Pickle* m,
|
| const param_type& p) {
|
| WriteParam(m, p.metadata);
|
|
|