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

Unified Diff: content/common/cc_messages.cc

Issue 1044093005: Preliminary compositor disabling patch. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove renderpass calculation Created 5 years, 8 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
« no previous file with comments | « content/common/cc_messages.h ('k') | content/common/cc_messages_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « content/common/cc_messages.h ('k') | content/common/cc_messages_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698