diff options
| author | danakj <danakj@chromium.org> | 2015-06-18 17:10:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-19 00:11:03 +0000 |
| commit | 64767d90be693c7e98efd1a0794bb567b46262ec (patch) | |
| tree | 6b8685977805702e4806fc95746c4d509dcd0b43 /content | |
| parent | f468166ed6757854d10fa3288476d881c947a7c4 (diff) | |
| download | chromium_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 'content')
| -rw-r--r-- | content/common/cc_messages.h | 6 | ||||
| -rw-r--r-- | content/common/cc_messages_unittest.cc | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h index 79a3169..938dcc4 100644 --- a/content/common/cc_messages.h +++ b/content/common/cc_messages.h @@ -264,9 +264,9 @@ IPC_STRUCT_TRAITS_BEGIN(cc::YUVVideoDrawQuad) IPC_STRUCT_TRAITS_END() IPC_STRUCT_TRAITS_BEGIN(cc::SharedQuadState) - IPC_STRUCT_TRAITS_MEMBER(content_to_target_transform) - IPC_STRUCT_TRAITS_MEMBER(content_bounds) - IPC_STRUCT_TRAITS_MEMBER(visible_content_rect) +IPC_STRUCT_TRAITS_MEMBER(quad_to_target_transform) +IPC_STRUCT_TRAITS_MEMBER(quad_layer_bounds) +IPC_STRUCT_TRAITS_MEMBER(visible_quad_layer_rect) IPC_STRUCT_TRAITS_MEMBER(clip_rect) IPC_STRUCT_TRAITS_MEMBER(is_clipped) IPC_STRUCT_TRAITS_MEMBER(opacity) diff --git a/content/common/cc_messages_unittest.cc b/content/common/cc_messages_unittest.cc index 88daaa7..3737e58 100644 --- a/content/common/cc_messages_unittest.cc +++ b/content/common/cc_messages_unittest.cc @@ -57,9 +57,9 @@ class CCMessagesTest : public testing::Test { } void Compare(const SharedQuadState* a, const SharedQuadState* b) { - EXPECT_EQ(a->content_to_target_transform, b->content_to_target_transform); - EXPECT_EQ(a->content_bounds, b->content_bounds); - EXPECT_EQ(a->visible_content_rect, b->visible_content_rect); + EXPECT_EQ(a->quad_to_target_transform, b->quad_to_target_transform); + EXPECT_EQ(a->quad_layer_bounds, b->quad_layer_bounds); + EXPECT_EQ(a->visible_quad_layer_rect, b->visible_quad_layer_rect); EXPECT_EQ(a->clip_rect, b->clip_rect); EXPECT_EQ(a->is_clipped, b->is_clipped); EXPECT_EQ(a->opacity, b->opacity); @@ -627,12 +627,12 @@ TEST_F(CCMessagesTest, UnusedSharedQuadStates) { ASSERT_EQ(2u, pass_out->shared_quad_state_list.size()); ASSERT_EQ(2u, pass_out->quad_list.size()); - EXPECT_EQ( - gfx::Size(1, 1).ToString(), - pass_out->shared_quad_state_list.ElementAt(0)->content_bounds.ToString()); - EXPECT_EQ( - gfx::Size(4, 4).ToString(), - pass_out->shared_quad_state_list.ElementAt(1)->content_bounds.ToString()); + EXPECT_EQ(gfx::Size(1, 1).ToString(), + pass_out->shared_quad_state_list.ElementAt(0) + ->quad_layer_bounds.ToString()); + EXPECT_EQ(gfx::Size(4, 4).ToString(), + pass_out->shared_quad_state_list.ElementAt(1) + ->quad_layer_bounds.ToString()); } TEST_F(CCMessagesTest, Resources) { |