| Index: content/common/cc_messages.cc
|
| diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc
|
| index 29294dba91571c7315977c609d8137bc8db5d22d..1bdfcea5621c6a4492d6d9769b73a5e864db18d0 100644
|
| --- a/content/common/cc_messages.cc
|
| +++ b/content/common/cc_messages.cc
|
| @@ -292,6 +292,7 @@ void ParamTraits<cc::RenderPass>::Write(
|
| WriteParam(m, p.id);
|
| WriteParam(m, p.output_rect);
|
| WriteParam(m, p.damage_rect);
|
| + WriteParam(m, p.overlay_rect);
|
| WriteParam(m, p.transform_to_root_target);
|
| WriteParam(m, p.has_transparent_background);
|
| WriteParam(m, p.quad_list.size());
|
| @@ -398,23 +399,20 @@ bool ParamTraits<cc::RenderPass>::Read(
|
| cc::RenderPassId id(-1, -1);
|
| gfx::Rect output_rect;
|
| gfx::Rect damage_rect;
|
| + gfx::Rect overlay_rect;
|
| gfx::Transform transform_to_root_target;
|
| bool has_transparent_background;
|
| size_t quad_list_size;
|
|
|
| - if (!ReadParam(m, iter, &id) ||
|
| - !ReadParam(m, iter, &output_rect) ||
|
| - !ReadParam(m, iter, &damage_rect) ||
|
| + if (!ReadParam(m, iter, &id) || !ReadParam(m, iter, &output_rect) ||
|
| + !ReadParam(m, iter, &damage_rect) || !ReadParam(m, iter, &overlay_rect) ||
|
| !ReadParam(m, iter, &transform_to_root_target) ||
|
| !ReadParam(m, iter, &has_transparent_background) ||
|
| !ReadParam(m, iter, &quad_list_size))
|
| return false;
|
|
|
| - p->SetAll(id,
|
| - output_rect,
|
| - damage_rect,
|
| - transform_to_root_target,
|
| - has_transparent_background);
|
| + p->SetAll(id, output_rect, damage_rect, overlay_rect,
|
| + transform_to_root_target, has_transparent_background);
|
|
|
| for (size_t i = 0; i < quad_list_size; ++i) {
|
| cc::DrawQuad::Material material;
|
| @@ -502,6 +500,8 @@ void ParamTraits<cc::RenderPass>::Log(
|
| l->append(", ");
|
| LogParam(p.damage_rect, l);
|
| l->append(", ");
|
| + LogParam(p.overlay_rect, l);
|
| + l->append(", ");
|
| LogParam(p.transform_to_root_target, l);
|
| l->append(", ");
|
| LogParam(p.has_transparent_background, l);
|
|
|