Make RenderPass::Id an isolated class

cc/quads/render_pass_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/quads/render_pass.h"
 
 #include "cc/base/math_util.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/quads/checkerboard_draw_quad.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/render_pass_test_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "ui/gfx/transform.h"
 
 using cc::TestRenderPass;
 
 namespace cc {
 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;
   gfx::Rect output_rect;
   gfx::Rect damage_rect;
   bool has_transparent_background;
   ScopedPtrVector<CopyOutputRequest> copy_callbacks;
 };
 
 static void CompareRenderPassLists(const RenderPassList& expected_list,
@@ skipping 19 matching lines @@
       EXPECT_EQ(expected->quad_list[i]->rect.ToString(),
                 actual->quad_list[i]->rect.ToString());
       EXPECT_EQ(
           expected->quad_list[i]->shared_quad_state->content_bounds.ToString(),
           actual->quad_list[i]->shared_quad_state->content_bounds.ToString());
     }
   }
 }
 
 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);
   gfx::Rect damage_rect(56, 123, 19, 43);
   bool has_transparent_background = true;
 
   scoped_ptr<TestRenderPass> pass = TestRenderPass::Create();
   pass->SetAll(id,
                output_rect,
                damage_rect,
@@ skipping 10 matching lines @@
                        false,
                        1,
                        SkXfermode::kSrcOver_Mode,
                        0);
 
   CheckerboardDrawQuad* checkerboard_quad =
       pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>();
   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);
   EXPECT_RECT_EQ(pass->output_rect, copy->output_rect);
   EXPECT_EQ(pass->transform_to_root_target, copy->transform_to_root_target);
   EXPECT_RECT_EQ(pass->damage_rect, copy->damage_rect);
   EXPECT_EQ(pass->has_transparent_background, copy->has_transparent_background);
   EXPECT_EQ(0u, copy->quad_list.size());
 
   // The copy request should not be copied/duplicated.
   EXPECT_EQ(1u, pass->copy_requests.size());
   EXPECT_EQ(0u, copy->copy_requests.size());
 
   EXPECT_EQ(sizeof(RenderPassSize), sizeof(RenderPass));
 }
 
 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);
   gfx::Rect damage_rect(56, 123, 19, 43);
   bool has_transparent_background = true;
 
   scoped_ptr<TestRenderPass> pass = TestRenderPass::Create();
   pass->SetAll(id,
                output_rect,
                damage_rect,
@@ skipping 44 matching lines @@
                              SkColor());
 
   CheckerboardDrawQuad* checkerboard_quad4 =
       pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>();
   checkerboard_quad4->SetNew(pass->shared_quad_state_list.back(),
                              gfx::Rect(4, 4, 4, 4),
                              gfx::Rect(4, 4, 4, 4),
                              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);
   gfx::Rect contrib_damage_rect(11, 16, 10, 15);
   bool contrib_has_transparent_background = true;
 
   scoped_ptr<TestRenderPass> contrib = TestRenderPass::Create();
   contrib->SetAll(contrib_id,
                   contrib_output_rect,
                   contrib_damage_rect,
@@ skipping 37 matching lines @@
   // Make a copy with CopyAll().
   RenderPassList copy_list;
   RenderPass::CopyAll(pass_list, &copy_list);
 
   CompareRenderPassLists(pass_list, copy_list);
 }
 
 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);
   gfx::Rect damage_rect(56, 123, 19, 43);
   bool has_transparent_background = true;
 
   scoped_ptr<TestRenderPass> pass = TestRenderPass::Create();
   pass->SetAll(id,
                output_rect,
                damage_rect,
@@ skipping 62 matching lines @@
 
   // Make a copy with CopyAll().
   RenderPassList copy_list;
   RenderPass::CopyAll(pass_list, &copy_list);
 
   CompareRenderPassLists(pass_list, copy_list);
 }
 
 }  // namespace
 }  // namespace cc