Revert "Revert 253606 "Revert 251238 "cc: Clean up iterator template to ...""

cc/layers/render_surface.h

 // Copyright 2010 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_H_
 #define CC_LAYERS_RENDER_SURFACE_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_lists.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_f.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 
 class Layer;
-template <typename LayerType>
-class LayerIterator;
 
 class CC_EXPORT RenderSurface {
  public:
   explicit RenderSurface(Layer* owning_layer);
   ~RenderSurface();
 
   // Returns the rect that encloses the RenderSurfaceImpl including any
   // reflection.
   gfx::RectF DrawableContentRect() const;
 
@@ skipping 73 matching lines @@
   void AddContributingDelegatedRenderPassLayer(Layer* layer) {}
 
   void SetNearestOcclusionImmuneAncestor(RenderSurface* surface) {
     nearest_occlusion_immune_ancestor_ = surface;
   }
   const RenderSurface* nearest_occlusion_immune_ancestor() const {
     return nearest_occlusion_immune_ancestor_;
   }
 
  private:
-  friend class LayerIterator<Layer>;
+  friend struct LayerIteratorActions;
 
   Layer* owning_layer_;
 
   // Uses this surface's space.
   gfx::Rect content_rect_;
 
   float draw_opacity_;
   bool draw_opacity_is_animating_;
   gfx::Transform draw_transform_;
   gfx::Transform screen_space_transform_;
@@ skipping 16 matching lines @@
 
   // For LayerIteratorActions
   int target_render_surface_layer_index_history_;
   int current_layer_index_history_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderSurface);
 };
 
 }  // namespace cc
 #endif  // CC_LAYERS_RENDER_SURFACE_H_