cc: Replace LayerIterator with iterator that walks layer list and effect tree

cc/layers/render_surface_impl.h

Index: cc/layers/render_surface_impl.h
diff --git a/cc/layers/render_surface_impl.h b/cc/layers/render_surface_impl.h
index 40e15f13d52910de90c7f3f78fd69b6cf7c28017..d7b47fc87775a57b86ad37c9efa6d74d37b3387c 100644
--- a/cc/layers/render_surface_impl.h
+++ b/cc/layers/render_surface_impl.h
@@ -28,7 +28,6 @@ class DamageTracker;
 class FilterOperations;
 class Occlusion;
 class LayerImpl;
-class LayerIterator;
 class LayerTreeImpl;
 
 struct AppendQuadsData;
@@ -131,7 +130,7 @@ class CC_EXPORT RenderSurfaceImpl {
   const FilterOperations& Filters() const;
   const FilterOperations& BackgroundFilters() const;
   gfx::PointF FiltersOrigin() const;
-  gfx::Transform FiltersTransform() const;
+  gfx::Transform SurfaceScale() const;
 
   bool HasCopyRequest() const;
 
@@ -155,14 +154,14 @@ class CC_EXPORT RenderSurfaceImpl {
   void set_effect_tree_index(int index) { effect_tree_index_ = index; }
   int EffectTreeIndex() const;
 
+  const EffectNode* OwningEffectNode() const;
+
  private:
   void SetContentRect(const gfx::Rect& content_rect);
   gfx::Rect CalculateClippedAccumulatedContentRect();
   gfx::Rect CalculateExpandedClipForFilters(
       const gfx::Transform& target_to_surface);
 
-  const EffectNode* OwningEffectNode() const;
-
   LayerTreeImpl* layer_tree_impl_;
   int stable_effect_id_;
   int effect_tree_index_;
@@ -209,12 +208,6 @@ class CC_EXPORT RenderSurfaceImpl {
 
   std::unique_ptr<DamageTracker> damage_tracker_;
 
-  // For LayerIteratorActions
-  int target_render_surface_layer_index_history_;
-  size_t current_layer_index_history_;
-
-  friend class LayerIterator;
-
   DISALLOW_COPY_AND_ASSIGN(RenderSurfaceImpl);
 };