summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2015-06-18 17:10:43 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-19 00:11:03 +0000
commit64767d90be693c7e98efd1a0794bb567b46262ec (patch)
tree6b8685977805702e4806fc95746c4d509dcd0b43 /components
parentf468166ed6757854d10fa3288476d881c947a7c4 (diff)
downloadchromium_src-64767d90be693c7e98efd1a0794bb567b46262ec.zip
chromium_src-64767d90be693c7e98efd1a0794bb567b46262ec.tar.gz
chromium_src-64767d90be693c7e98efd1a0794bb567b46262ec.tar.bz2
cc: Rename visible_content_rect and content stuff on quads.
This renames visible_content_rect to visible_layer_rect. And for SharedQuadState renames the transforms and rects to no longer refer to "content" and instead refer to the space the the DrawQuad rects. R=enne, vmpstr TBR=dcheng BUG=413479 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1175113010 Cr-Commit-Position: refs/heads/master@{#335172}
Diffstat (limited to 'components')
-rw-r--r--components/view_manager/display_manager.cc2
-rw-r--r--components/view_manager/public/interfaces/quads.mojom13
2 files changed, 8 insertions, 7 deletions
diff --git a/components/view_manager/display_manager.cc b/components/view_manager/display_manager.cc
index c292450..67caecc 100644
--- a/components/view_manager/display_manager.cc
+++ b/components/view_manager/display_manager.cc
@@ -66,7 +66,7 @@ void DrawViewTree(mojo::Pass* pass,
auto sqs = mojo::CreateDefaultSQS(view->bounds().size());
sqs->blend_mode = mojo::SK_XFERMODE_kSrcOver_Mode;
sqs->opacity = combined_opacity;
- sqs->content_to_target_transform = mojo::Transform::From(node_transform);
+ sqs->quad_to_target_transform = mojo::Transform::From(node_transform);
pass->quads.push_back(surface_quad.Pass());
pass->shared_quad_states.push_back(sqs.Pass());
diff --git a/components/view_manager/public/interfaces/quads.mojom b/components/view_manager/public/interfaces/quads.mojom
index b3af3d5..ae482fd 100644
--- a/components/view_manager/public/interfaces/quads.mojom
+++ b/components/view_manager/public/interfaces/quads.mojom
@@ -183,14 +183,15 @@ enum SkXfermode {
};
struct SharedQuadState {
- // Transforms from quad's original content space to its target content space.
- Transform content_to_target_transform;
+ // Transforms quad rects into the target content space.
+ Transform quad_to_target_transform;
- // This size lives in the content space for the quad's originating layer.
- Size content_bounds;
+ // The size of the quads' originating layer in the space of the quad rects.
+ Size quad_layer_bounds;
- // This rect lives in the content space for the quad's originating layer.
- Rect visible_content_rect;
+ // The size of the visible area in the quads' originating layer, in the space
+ // of the quad rects.
+ Rect visible_quad_layer_rect;
// This rect lives in the target content space.
Rect clip_rect;