Chromium Code Reviews| Index: content/common/cc_messages.cc |
| diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc |
| index 8d93e1f9744f7ddd5eb31b4a3431976ff3601a85..7931178a5355558d1f622fc41f066e0558f2d3c9 100644 |
| --- a/content/common/cc_messages.cc |
| +++ b/content/common/cc_messages.cc |
| @@ -711,6 +711,8 @@ void ParamTraits<cc::DelegatedFrameData>::Write(Message* m, |
| const param_type& p) { |
| DCHECK_NE(0u, p.render_pass_list.size()); |
| + WriteParam(m, p.device_scale_factor); |
|
danakj
2014/06/06 17:17:12
Can you move this below the call to Reserve() and
|
| + |
| size_t to_reserve = p.resource_list.size() * sizeof(cc::TransferableResource); |
| for (size_t i = 0; i < p.render_pass_list.size(); ++i) { |
| const cc::RenderPass* pass = p.render_pass_list[i]; |
| @@ -727,6 +729,9 @@ void ParamTraits<cc::DelegatedFrameData>::Write(Message* m, |
| bool ParamTraits<cc::DelegatedFrameData>::Read(const Message* m, |
| PickleIterator* iter, |
| param_type* p) { |
| + if (!ReadParam(m, iter, &p->device_scale_factor)) |
| + return false; |
| + |
| const static size_t kMaxRenderPasses = 10000; |
| size_t num_render_passes; |
| @@ -746,6 +751,7 @@ bool ParamTraits<cc::DelegatedFrameData>::Read(const Message* m, |
| void ParamTraits<cc::DelegatedFrameData>::Log(const param_type& p, |
| std::string* l) { |
| l->append("DelegatedFrameData("); |
| + LogParam(p.device_scale_factor, l); |
| LogParam(p.resource_list, l); |
| l->append(", ["); |
| for (size_t i = 0; i < p.render_pass_list.size(); ++i) { |