Index: cc/layers/delegated_renderer_layer_impl_unittest.cc |
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc |
index 69f54f9a4c8736649cbac699bf218630c95f0f44..94ba6c7de5b889cde896ec033eec7f534b39f097 100644 |
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc |
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc |
@@ -92,18 +92,18 @@ class DelegatedRendererLayerImplTestSimple |
RenderPassList delegated_render_passes; |
TestRenderPass* pass1 = AddRenderPass(&delegated_render_passes, |
- RenderPass::Id(9, 6), |
+ RenderPassId(9, 6), |
gfx::Rect(6, 6, 6, 6), |
gfx::Transform(1, 0, 0, 1, 5, 6)); |
AddQuad(pass1, gfx::Rect(0, 0, 6, 6), 33u); |
TestRenderPass* pass2 = AddRenderPass(&delegated_render_passes, |
- RenderPass::Id(9, 7), |
+ RenderPassId(9, 7), |
gfx::Rect(7, 7, 7, 7), |
gfx::Transform(1, 0, 0, 1, 7, 8)); |
AddQuad(pass2, gfx::Rect(0, 0, 7, 7), 22u); |
AddRenderPassQuad(pass2, pass1); |
TestRenderPass* pass3 = AddRenderPass(&delegated_render_passes, |
- RenderPass::Id(9, 8), |
+ RenderPassId(9, 8), |
gfx::Rect(0, 0, 8, 8), |
gfx::Transform(1, 0, 0, 1, 9, 10)); |
AddRenderPassQuad(pass3, pass2); |
@@ -214,7 +214,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, AddsQuadsToTargetRenderPass) { |
ASSERT_EQ(5u, frame.render_passes.size()); |
// The layer's target is the RenderPass from layer_after_. |
- EXPECT_EQ(RenderPass::Id(3, 0), frame.render_passes[3]->id); |
+ EXPECT_EQ(RenderPassId(3, 0), frame.render_passes[3]->id); |
// The DelegatedRendererLayer should have added copies of quads in its root |
// RenderPass to its target RenderPass. The layer_after_ also adds one quad. |
@@ -438,7 +438,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsQuadsToTargetRenderPass) { |
ASSERT_EQ(6u, frame.render_passes.size()); |
// The layer's target is the RenderPass owned by itself. |
- EXPECT_EQ(RenderPass::Id(4, 0), frame.render_passes[3]->id); |
+ EXPECT_EQ(RenderPassId(4, 0), frame.render_passes[3]->id); |
// The DelegatedRendererLayer should have added copies of quads in its root |
// RenderPass to its target RenderPass. |
@@ -520,11 +520,10 @@ class DelegatedRendererLayerImplTestTransform |
bool child_pass_clipped = false; |
{ |
- TestRenderPass* pass = AddRenderPass( |
- &delegated_render_passes, |
- RenderPass::Id(10, 7), |
- child_pass_rect, |
- gfx::Transform()); |
+ TestRenderPass* pass = AddRenderPass(&delegated_render_passes, |
+ RenderPassId(10, 7), |
+ child_pass_rect, |
+ gfx::Transform()); |
SharedQuadState* shared_quad_state = |
pass->CreateAndAppendSharedQuadState(); |
shared_quad_state->SetAll(child_pass_transform, |
@@ -560,11 +559,10 @@ class DelegatedRendererLayerImplTestTransform |
gfx::Rect root_pass_clip_rect(10, 10, 35, 35); |
bool root_pass_clipped = root_delegated_render_pass_is_clipped_; |
- TestRenderPass* pass = AddRenderPass( |
- &delegated_render_passes, |
- RenderPass::Id(9, 6), |
- root_pass_rect, |
- gfx::Transform()); |
+ TestRenderPass* pass = AddRenderPass(&delegated_render_passes, |
+ RenderPassId(9, 6), |
+ root_pass_rect, |
+ gfx::Transform()); |
SharedQuadState* shared_quad_state = pass->CreateAndAppendSharedQuadState(); |
shared_quad_state->SetAll(root_pass_transform, |
root_pass_content_bounds, |
@@ -577,16 +575,15 @@ class DelegatedRendererLayerImplTestTransform |
RenderPassDrawQuad* render_pass_quad = |
pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); |
- render_pass_quad->SetNew( |
- shared_quad_state, |
- gfx::Rect(5, 5, 7, 7), // quad_rect |
- gfx::Rect(5, 5, 7, 7), // visible_rect |
- RenderPass::Id(10, 7), // render_pass_id |
- 0, // mask_resource_id |
- gfx::RectF(), // mask_uv_rect |
- FilterOperations(), // filters |
- gfx::Vector2dF(), // filters_scale |
- FilterOperations()); // background_filters |
+ render_pass_quad->SetNew(shared_quad_state, |
+ gfx::Rect(5, 5, 7, 7), // quad_rect |
+ gfx::Rect(5, 5, 7, 7), // visible_rect |
+ RenderPassId(10, 7), // render_pass_id |
+ 0, // mask_resource_id |
+ gfx::RectF(), // mask_uv_rect |
+ FilterOperations(), // filters |
+ gfx::Vector2dF(), // filters_scale |
+ FilterOperations()); // background_filters |
SolidColorDrawQuad* color_quad; |
color_quad = pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); |
@@ -957,11 +954,10 @@ class DelegatedRendererLayerImplTestClip |
bool child_pass_clipped = false; |
{ |
- TestRenderPass* pass = AddRenderPass( |
- &delegated_render_passes, |
- RenderPass::Id(10, 7), |
- child_pass_rect, |
- gfx::Transform()); |
+ TestRenderPass* pass = AddRenderPass(&delegated_render_passes, |
+ RenderPassId(10, 7), |
+ child_pass_rect, |
+ gfx::Transform()); |
SharedQuadState* shared_quad_state = |
pass->CreateAndAppendSharedQuadState(); |
shared_quad_state->SetAll(child_pass_transform, |
@@ -995,11 +991,10 @@ class DelegatedRendererLayerImplTestClip |
gfx::Rect root_pass_clip_rect(5, 5, 40, 40); |
bool root_pass_clipped = root_delegated_render_pass_is_clipped_; |
- TestRenderPass* pass = AddRenderPass( |
- &delegated_render_passes, |
- RenderPass::Id(9, 6), |
- root_pass_rect, |
- gfx::Transform()); |
+ TestRenderPass* pass = AddRenderPass(&delegated_render_passes, |
+ RenderPassId(9, 6), |
+ root_pass_rect, |
+ gfx::Transform()); |
SharedQuadState* shared_quad_state = pass->CreateAndAppendSharedQuadState(); |
shared_quad_state->SetAll(root_pass_transform, |
root_pass_content_bounds, |
@@ -1012,16 +1007,15 @@ class DelegatedRendererLayerImplTestClip |
RenderPassDrawQuad* render_pass_quad = |
pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); |
- render_pass_quad->SetNew( |
- shared_quad_state, |
- gfx::Rect(5, 5, 7, 7), // quad_rect |
- gfx::Rect(5, 5, 7, 7), // visible_quad_rect |
- RenderPass::Id(10, 7), // render_pass_id |
- 0, // mask_resource_id |
- gfx::RectF(), // mask_uv_rect |
- FilterOperations(), // filters |
- gfx::Vector2dF(), // filters_scale |
- FilterOperations()); // background_filters |
+ render_pass_quad->SetNew(shared_quad_state, |
+ gfx::Rect(5, 5, 7, 7), // quad_rect |
+ gfx::Rect(5, 5, 7, 7), // visible_quad_rect |
+ RenderPassId(10, 7), // render_pass_id |
+ 0, // mask_resource_id |
+ gfx::RectF(), // mask_uv_rect |
+ FilterOperations(), // filters |
+ gfx::Vector2dF(), // filters_scale |
+ FilterOperations()); // background_filters |
SolidColorDrawQuad* color_quad; |
color_quad = pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); |
@@ -1339,16 +1333,15 @@ TEST_F(DelegatedRendererLayerImplTest, InvalidRenderPassDrawQuad) { |
delegated_renderer_layer->SetDrawsContent(true); |
RenderPassList delegated_render_passes; |
- TestRenderPass* pass1 = AddRenderPass( |
- &delegated_render_passes, |
- RenderPass::Id(9, 6), |
- gfx::Rect(0, 0, 10, 10), |
- gfx::Transform()); |
+ TestRenderPass* pass1 = AddRenderPass(&delegated_render_passes, |
+ RenderPassId(9, 6), |
+ gfx::Rect(0, 0, 10, 10), |
+ gfx::Transform()); |
AddQuad(pass1, gfx::Rect(0, 0, 6, 6), 33u); |
// This render pass isn't part of the frame. |
scoped_ptr<TestRenderPass> missing_pass(TestRenderPass::Create()); |
- missing_pass->SetNew(RenderPass::Id(9, 7), |
+ missing_pass->SetNew(RenderPassId(9, 7), |
gfx::Rect(7, 7, 7, 7), |
gfx::Rect(7, 7, 7, 7), |
gfx::Transform()); |
@@ -1397,13 +1390,13 @@ TEST_F(DelegatedRendererLayerImplTest, Occlusion) { |
RenderPassList delegated_render_passes; |
// pass2 is just the size of the quad. It contributes to |pass1| with a |
// translation of (11,0). |
- RenderPass::Id pass2_id = |
+ RenderPassId pass2_id = |
delegated_renderer_layer_impl->FirstContributingRenderPassId(); |
TestRenderPass* pass2 = |
AddRenderPass(&delegated_render_passes, pass2_id, quad_rect, transform); |
AddQuad(pass2, gfx::Rect(quad_rect.size()), SK_ColorRED); |
// |pass1| covers the whole layer. |
- RenderPass::Id pass1_id = RenderPass::Id(impl.root_layer()->id(), 0); |
+ RenderPassId pass1_id = RenderPassId(impl.root_layer()->id(), 0); |
TestRenderPass* pass1 = AddRenderPass(&delegated_render_passes, |
pass1_id, |
gfx::Rect(layer_size), |
@@ -1549,7 +1542,7 @@ TEST_F(DelegatedRendererLayerImplTest, PushPropertiesTo) { |
RenderPassList delegated_render_passes; |
// |pass1| covers the whole layer. |
- RenderPass::Id pass1_id = RenderPass::Id(5, 0); |
+ RenderPassId pass1_id = RenderPassId(5, 0); |
AddRenderPass(&delegated_render_passes, |
pass1_id, |
gfx::Rect(layer_size), |