Index: content/common/cc_messages.cc |
diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc |
index 04d3af94def7b2723222d07a17c29e100eedafe6..b00a693d2850ffb4980ad4d5811e23bf3f339134 100644 |
--- a/content/common/cc_messages.cc |
+++ b/content/common/cc_messages.cc |
@@ -569,7 +569,9 @@ void ParamTraits<cc::Mailbox>::Log(const param_type& p, std::string* l) { |
*l += base::StringPrintf("%02x", p.name[i]); |
} |
-void ParamTraits<cc::CompositorFrame>::Write(Message* m, const param_type& p) { |
+void ParamTraits<cc::DelegatedCompositorFrame>::Write(Message* m, |
+ const param_type& p) { |
+ WriteParam(m, static_cast<const cc::CompositorFrame&>(p)); |
WriteParam(m, p.size); |
WriteParam(m, p.resource_list); |
WriteParam(m, p.render_pass_list.size()); |
@@ -577,11 +579,14 @@ void ParamTraits<cc::CompositorFrame>::Write(Message* m, const param_type& p) { |
WriteParam(m, *p.render_pass_list[i]); |
} |
-bool ParamTraits<cc::CompositorFrame>::Read(const Message* m, |
+bool ParamTraits<cc::DelegatedCompositorFrame>::Read(const Message* m, |
PickleIterator* iter, |
param_type* p) { |
const static size_t kMaxRenderPasses = 10000; |
+ if (!ReadParam(m, iter, static_cast<cc::CompositorFrame*>(p))) |
piman
2012/12/14 22:02:22
Also fail if the read type is not DELEGATED.
aelias_OOO_until_Jul13
2012/12/15 00:06:17
Done.
|
+ return false; |
+ |
size_t num_render_passes; |
if (!ReadParam(m, iter, &p->size) || |
!ReadParam(m, iter, &p->resource_list) || |
@@ -597,9 +602,10 @@ bool ParamTraits<cc::CompositorFrame>::Read(const Message* m, |
return true; |
} |
-void ParamTraits<cc::CompositorFrame>::Log(const param_type& p, |
- std::string* l) { |
- l->append("CompositorFrame("); |
+void ParamTraits<cc::DelegatedCompositorFrame>::Log(const param_type& p, |
+ std::string* l) { |
+ l->append("DelegatedCompositorFrame("); |
+ LogParam(static_cast<const cc::CompositorFrame&>(p), l); |
LogParam(p.size, l); |
l->append(", "); |
LogParam(p.resource_list, l); |