Make RenderPass::Id an isolated class

cc/layers/delegated_renderer_layer_impl_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/layers/delegated_renderer_layer_impl.h"
 
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/layers/solid_color_layer_impl.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
@@ skipping 74 matching lines @@
     delegated_renderer_layer->SetPosition(gfx::Point(3, 3));
     delegated_renderer_layer->SetBounds(gfx::Size(10, 10));
     delegated_renderer_layer->SetContentBounds(gfx::Size(10, 10));
     delegated_renderer_layer->SetDrawsContent(true);
     gfx::Transform transform;
     transform.Translate(1.0, 1.0);
     delegated_renderer_layer->SetTransform(transform);
 
     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);
     delegated_renderer_layer->SetFrameDataForRenderPasses(
         1.f, &delegated_render_passes);
 
     // The RenderPasses should be taken by the layer.
     EXPECT_EQ(0u, delegated_render_passes.size());
 
     root_layer_ = root_layer.get();
@@ skipping 90 matching lines @@
 
 TEST_F(DelegatedRendererLayerImplTestSimple, AddsQuadsToTargetRenderPass) {
   LayerTreeHostImpl::FrameData frame;
   EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
 
   // Each non-DelegatedRendererLayer added one RenderPass. The
   // DelegatedRendererLayer added two contributing passes.
   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.
   ASSERT_EQ(2u, frame.render_passes[3]->quad_list.size());
 
   // Verify it added the right quads.
   EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(),
             frame.render_passes[3]->quad_list[0]->rect.ToString());
 
   // Its target layer should have a quad as well.
@@ skipping 203 matching lines @@
 TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsQuadsToTargetRenderPass) {
   LayerTreeHostImpl::FrameData frame;
   EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
 
   // Each non-DelegatedRendererLayer added one RenderPass. The
   // DelegatedRendererLayer added two contributing passes and its owned surface
   // added one pass.
   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.
   // The layer_after also adds one quad.
   ASSERT_EQ(1u, frame.render_passes[3]->quad_list.size());
 
   // Verify it added the right quads.
   EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(),
             frame.render_passes[3]->quad_list[0]->rect.ToString());
 
@@ skipping 61 matching lines @@
 
     gfx::Size child_pass_content_bounds(7, 7);
     gfx::Rect child_pass_rect(20, 20, 7, 7);
     gfx::Transform child_pass_transform;
     child_pass_transform.Scale(0.8f, 0.8f);
     child_pass_transform.Translate(9.0, 9.0);
     gfx::Rect child_pass_clip_rect(21, 21, 3, 3);
     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,
                                 child_pass_content_bounds,
                                 child_pass_rect,
                                 child_pass_clip_rect,
                                 child_pass_clipped,
                                 1.f,
                                 SkXfermode::kSrcOver_Mode,
                                 0);
@@ skipping 15 matching lines @@
     }
 
     gfx::Size root_pass_content_bounds(100, 100);
     gfx::Rect root_pass_rect(0, 0, 100, 100);
     gfx::Transform root_pass_transform;
     root_pass_transform.Scale(1.5, 1.5);
     root_pass_transform.Translate(7.0, 7.0);
     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,
                               root_pass_rect,
                               root_pass_clip_rect,
                               root_pass_clipped,
                               1.f,
                               SkXfermode::kSrcOver_Mode,
                               0);
 
     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>();
     color_quad->SetNew(shared_quad_state,
                        gfx::Rect(0, 0, 10, 10),
                        gfx::Rect(0, 0, 10, 10),
                        1u,
                        false);
 
     color_quad = pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
@@ skipping 350 matching lines @@
 
     RenderPassList delegated_render_passes;
 
     gfx::Size child_pass_content_bounds(7, 7);
     gfx::Rect child_pass_rect(20, 20, 7, 7);
     gfx::Transform child_pass_transform;
     gfx::Rect child_pass_clip_rect(21, 21, 3, 3);
     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,
                                 child_pass_content_bounds,
                                 child_pass_rect,
                                 child_pass_clip_rect,
                                 child_pass_clipped,
                                 1.f,
                                 SkXfermode::kSrcOver_Mode,
                                 0);
@@ skipping 13 matching lines @@
                          1u,
                          false);
     }
 
     gfx::Size root_pass_content_bounds(50, 50);
     gfx::Rect root_pass_rect(0, 0, 50, 50);
     gfx::Transform root_pass_transform;
     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,
                               root_pass_rect,
                               root_pass_clip_rect,
                               root_pass_clipped,
                               1.f,
                               SkXfermode::kSrcOver_Mode,
                               0);
 
     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>();
     color_quad->SetNew(shared_quad_state,
                        gfx::Rect(0, 0, 10, 10),
                        gfx::Rect(0, 0, 10, 10),
                        1u,
                        false);
 
     color_quad = pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
@@ skipping 297 matching lines @@
       FakeDelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 4);
 
   host_impl_->SetViewportSize(gfx::Size(100, 100));
 
   delegated_renderer_layer->SetPosition(gfx::Point(3, 3));
   delegated_renderer_layer->SetBounds(gfx::Size(10, 10));
   delegated_renderer_layer->SetContentBounds(gfx::Size(10, 10));
   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());
 
   // But a render pass quad refers to it.
   AddRenderPassQuad(pass1, missing_pass.get());
 
   delegated_renderer_layer->SetFrameDataForRenderPasses(
       1.f, &delegated_render_passes);
 
@@ skipping 28 matching lines @@
 
   FakeDelegatedRendererLayerImpl* delegated_renderer_layer_impl =
       impl.AddChildToRoot<FakeDelegatedRendererLayerImpl>();
   delegated_renderer_layer_impl->SetBounds(layer_size);
   delegated_renderer_layer_impl->SetContentBounds(layer_size);
   delegated_renderer_layer_impl->SetDrawsContent(true);
 
   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),
                                         gfx::Transform());
   AddRenderPassQuad(pass1, pass2, 0, FilterOperations(), transform);
   delegated_renderer_layer_impl->SetFrameDataForRenderPasses(
       1.f, &delegated_render_passes);
 
   impl.CalcDrawProps(viewport_size);
 
@@ skipping 125 matching lines @@
   gfx::Size layer_size(1000, 1000);
 
   scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer_impl =
       FakeDelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 5);
   delegated_renderer_layer_impl->SetBounds(layer_size);
   delegated_renderer_layer_impl->SetContentBounds(layer_size);
   delegated_renderer_layer_impl->SetDrawsContent(true);
 
   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),
                 gfx::Transform());
   delegated_renderer_layer_impl->SetFrameDataForRenderPasses(
       2.f, &delegated_render_passes);
   EXPECT_EQ(0.5f, delegated_renderer_layer_impl->inverse_device_scale_factor());
 
   scoped_ptr<DelegatedRendererLayerImpl> other_layer =
       DelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 6);
 
   delegated_renderer_layer_impl->PushPropertiesTo(other_layer.get());
 
   EXPECT_EQ(0.5f, other_layer->inverse_device_scale_factor());
 }
 
 }  // namespace
 }  // namespace cc