Make RenderPass::Id an isolated class

cc/layers/render_surface_impl.h

 // 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.
 
 #ifndef CC_LAYERS_RENDER_SURFACE_IMPL_H_
 #define CC_LAYERS_RENDER_SURFACE_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_lists.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/shared_quad_state.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 
 class DamageTracker;
 class DelegatedRendererLayerImpl;
 template <typename LayerType>
 class OcclusionTracker;
+class RenderPassId;
 class RenderPassSink;
 class LayerImpl;
 template <typename LayerType>
 class LayerIterator;
 
 struct AppendQuadsData;
 
 class CC_EXPORT RenderSurfaceImpl {
  public:
   explicit RenderSurfaceImpl(LayerImpl* owning_layer);
@@ skipping 87 matching lines @@
   void ClearLayerLists();
 
   int OwningLayerId() const;
 
   void ResetPropertyChangedFlag() { surface_property_changed_ = false; }
   bool SurfacePropertyChanged() const;
   bool SurfacePropertyChangedOnlyFromDescendant() const;
 
   DamageTracker* damage_tracker() const { return damage_tracker_.get(); }
 
-  RenderPass::Id RenderPassId();
+  RenderPassId GetRenderPassId();
 
   void AppendRenderPasses(RenderPassSink* pass_sink);
   void 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);
 
  private:
   LayerImpl* owning_layer_;
 
   // Uses this surface's space.
   gfx::Rect content_rect_;
   bool surface_property_changed_ : 1;
   bool draw_opacity_is_animating_ : 1;
   bool target_surface_transforms_are_animating_ : 1;
   bool screen_space_transforms_are_animating_ : 1;
@@ skipping 24 matching lines @@
   int target_render_surface_layer_index_history_;
   int current_layer_index_history_;
 
   friend class LayerIterator<LayerImpl>;
 
   DISALLOW_COPY_AND_ASSIGN(RenderSurfaceImpl);
 };
 
 }  // namespace cc
 #endif  // CC_LAYERS_RENDER_SURFACE_IMPL_H_