Make RenderPass::Id an isolated class

cc/trees/layer_tree_host_unittest_delegated.cc

 // Copyright 2013 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/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 62 matching lines @@
 
 // These tests deal with delegated renderer layers.
 class LayerTreeHostDelegatedTest : public LayerTreeTest {
  protected:
   scoped_ptr<DelegatedFrameData> CreateFrameData(
       const gfx::Rect& root_output_rect,
       const gfx::Rect& root_damage_rect) {
     scoped_ptr<DelegatedFrameData> frame(new DelegatedFrameData);
 
     scoped_ptr<RenderPass> root_pass(RenderPass::Create());
-    root_pass->SetNew(RenderPass::Id(1, 1),
+    root_pass->SetNew(RenderPassId(1, 1),
                       root_output_rect,
                       root_damage_rect,
                       gfx::Transform());
     frame->render_pass_list.push_back(root_pass.Pass());
     return frame.Pass();
   }
 
   scoped_ptr<DelegatedFrameData> CreateInvalidFrameData(
       const gfx::Rect& root_output_rect,
       const gfx::Rect& root_damage_rect) {
     scoped_ptr<DelegatedFrameData> frame(new DelegatedFrameData);
 
     scoped_ptr<RenderPass> root_pass(RenderPass::Create());
-    root_pass->SetNew(RenderPass::Id(1, 1),
+    root_pass->SetNew(RenderPassId(1, 1),
                       root_output_rect,
                       root_damage_rect,
                       gfx::Transform());
 
     SharedQuadState* shared_quad_state =
         root_pass->CreateAndAppendSharedQuadState();
 
     gfx::Rect rect = root_output_rect;
     gfx::Rect opaque_rect = root_output_rect;
     gfx::Rect visible_rect = root_output_rect;
@@ skipping 51 matching lines @@
                  resource_id,
                  false,
                  gfx::PointF(0.f, 0.f),
                  gfx::PointF(1.f, 1.f),
                  SK_ColorTRANSPARENT,
                  vertex_opacity,
                  false);
   }
 
   void AddRenderPass(DelegatedFrameData* frame,
-                     RenderPass::Id id,
+                     RenderPassId id,
                      const gfx::Rect& output_rect,
                      const gfx::Rect& damage_rect,
                      const FilterOperations& filters,
                      const FilterOperations& background_filters) {
     for (size_t i = 0; i < frame->render_pass_list.size(); ++i)
       DCHECK(id != frame->render_pass_list[i]->id);
 
     scoped_ptr<RenderPass> pass(RenderPass::Create());
     pass->SetNew(id,
                  output_rect,
@@ skipping 2012 matching lines @@
   }
 
   scoped_refptr<DelegatedRendererLayer> delegated_thief_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostDelegatedTestRemoveAndChangeResources);
 
 }  // namespace
 }  // namespace cc