Make RenderPass::Id an isolated class

cc/layers/render_surface_impl.cc

 // Copyright 2011 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/render_surface_impl.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
@@ skipping 89 matching lines @@
       static_cast<DelegatedRendererLayerImpl*>(layer);
   contributing_delegated_render_pass_layer_list_.push_back(
       delegated_renderer_layer);
 }
 
 void RenderSurfaceImpl::ClearLayerLists() {
   layer_list_.clear();
   contributing_delegated_render_pass_layer_list_.clear();
 }
 
-RenderPass::Id RenderSurfaceImpl::RenderPassId() {
+RenderPassId RenderSurfaceImpl::GetRenderPassId() {
   int layer_id = owning_layer_->id();
   int sub_id = 0;
   DCHECK_GT(layer_id, 0);
-  return RenderPass::Id(layer_id, sub_id);
+  return RenderPassId(layer_id, sub_id);
 }
 
 void RenderSurfaceImpl::AppendRenderPasses(RenderPassSink* pass_sink) {
   for (size_t i = 0;
        i < contributing_delegated_render_pass_layer_list_.size();
        ++i) {
     DelegatedRendererLayerImpl* delegated_renderer_layer =
         contributing_delegated_render_pass_layer_list_[i];
     delegated_renderer_layer->AppendContributingRenderPasses(pass_sink);
   }
 
   scoped_ptr<RenderPass> pass = RenderPass::Create(layer_list_.size());
-  pass->SetNew(RenderPassId(),
+  pass->SetNew(GetRenderPassId(),
                content_rect_,
                gfx::IntersectRects(content_rect_,
                                    damage_tracker_->current_damage_rect()),
                screen_space_transform_);
   pass_sink->AppendRenderPass(pass.Pass());
 }
 
 void RenderSurfaceImpl::AppendQuads(
     RenderPass* render_pass,
     const OcclusionTracker<LayerImpl>& occlusion_tracker,
     AppendQuadsData* append_quads_data,
     bool for_replica,
-    RenderPass::Id render_pass_id) {
+    RenderPassId render_pass_id) {
   DCHECK(!for_replica || owning_layer_->has_replica());
 
   const gfx::Transform& draw_transform =
       for_replica ? replica_draw_transform_ : draw_transform_;
   gfx::Rect visible_content_rect =
       occlusion_tracker.UnoccludedContributingSurfaceContentRect(
           content_rect_, draw_transform);
   if (visible_content_rect.IsEmpty())
     return;
 
@@ skipping 80 matching lines @@
                visible_content_rect,
                render_pass_id,
                mask_resource_id,
                mask_uv_rect,
                owning_layer_->filters(),
                owning_layer_to_target_scale,
                owning_layer_->background_filters());
 }
 
 }  // namespace cc