| Index: cc/quads/render_pass_unittest.cc
|
| diff --git a/cc/quads/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc
|
| index 4e555b8f7ea972d9fa5331da91513635177e1c51..9d123180a277a106d567a08dc5dfdc8b5da6283d 100644
|
| --- a/cc/quads/render_pass_unittest.cc
|
| +++ b/cc/quads/render_pass_unittest.cc
|
| @@ -23,7 +23,7 @@ namespace {
|
| struct RenderPassSize {
|
| // If you add a new field to this class, make sure to add it to the
|
| // Copy() tests.
|
| - RenderPass::Id id;
|
| + RenderPassId id;
|
| QuadList quad_list;
|
| SharedQuadStateList shared_quad_state_list;
|
| gfx::Transform transform_to_root_target;
|
| @@ -63,7 +63,7 @@ static void CompareRenderPassLists(const RenderPassList& expected_list,
|
| }
|
|
|
| TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) {
|
| - RenderPass::Id id(3, 2);
|
| + RenderPassId id(3, 2);
|
| gfx::Rect output_rect(45, 22, 120, 13);
|
| gfx::Transform transform_to_root =
|
| gfx::Transform(1.0, 0.5, 0.5, -0.5, -1.0, 0.0);
|
| @@ -94,7 +94,7 @@ TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) {
|
| checkerboard_quad->SetNew(
|
| pass->shared_quad_state_list.back(), gfx::Rect(), gfx::Rect(), SkColor());
|
|
|
| - RenderPass::Id new_id(63, 4);
|
| + RenderPassId new_id(63, 4);
|
|
|
| scoped_ptr<RenderPass> copy = pass->Copy(new_id);
|
| EXPECT_EQ(new_id, copy->id);
|
| @@ -114,7 +114,7 @@ TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) {
|
| TEST(RenderPassTest, CopyAllShouldBeIdentical) {
|
| RenderPassList pass_list;
|
|
|
| - RenderPass::Id id(3, 2);
|
| + RenderPassId id(3, 2);
|
| gfx::Rect output_rect(45, 22, 120, 13);
|
| gfx::Transform transform_to_root =
|
| gfx::Transform(1.0, 0.5, 0.5, -0.5, -1.0, 0.0);
|
| @@ -179,7 +179,7 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) {
|
| SkColor());
|
|
|
| // A second render pass with a quad.
|
| - RenderPass::Id contrib_id(4, 1);
|
| + RenderPassId contrib_id(4, 1);
|
| gfx::Rect contrib_output_rect(10, 15, 12, 17);
|
| gfx::Transform contrib_transform_to_root =
|
| gfx::Transform(1.0, 0.5, 0.5, -0.5, -1.0, 0.0);
|
| @@ -237,7 +237,7 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) {
|
| TEST(RenderPassTest, CopyAllWithCulledQuads) {
|
| RenderPassList pass_list;
|
|
|
| - RenderPass::Id id(3, 2);
|
| + RenderPassId id(3, 2);
|
| gfx::Rect output_rect(45, 22, 120, 13);
|
| gfx::Transform transform_to_root =
|
| gfx::Transform(1.0, 0.5, 0.5, -0.5, -1.0, 0.0);
|
|
|