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

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;
 class QuadSink;
 class RenderPassSink;
 class LayerImpl;
-template <typename LayerType>
-class LayerIterator;
 
 struct AppendQuadsData;
 
 class CC_EXPORT RenderSurfaceImpl {
  public:
   explicit RenderSurfaceImpl(LayerImpl* owning_layer);
   virtual ~RenderSurfaceImpl();
 
   gfx::PointF ContentRectCenter() const {
     return gfx::RectF(content_rect_).CenterPoint();
@@ skipping 129 matching lines @@
   // The nearest ancestor target surface that will contain the contents of this
   // surface, and that ignores outside occlusion. This can point to itself.
   RenderSurfaceImpl* nearest_occlusion_immune_ancestor_;
 
   scoped_ptr<DamageTracker> damage_tracker_;
 
   // For LayerIteratorActions
   int target_render_surface_layer_index_history_;
   int current_layer_index_history_;
 
-  friend class LayerIterator<LayerImpl>;
+  friend struct LayerIteratorActions;
 
   DISALLOW_COPY_AND_ASSIGN(RenderSurfaceImpl);
 };
 
 }  // namespace cc
 #endif  // CC_LAYERS_RENDER_SURFACE_IMPL_H_