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

cc/trees/damage_tracker.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/trees/damage_tracker.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 110 matching lines @@
   } else {
     // TODO(shawnsingh): can we clamp this damage to the surface's content rect?
     // (affects performance, but not correctness)
     damage_for_this_update.Union(damage_from_active_layers);
     damage_for_this_update.Union(damage_from_surface_mask);
     damage_for_this_update.Union(damage_from_leftover_rects);
 
     gfx::Rect damage_rect;
     bool is_rect_valid = damage_for_this_update.GetAsRect(&damage_rect);
     if (is_rect_valid) {
-      damage_rect = filters.MapRect(
-          damage_rect, target_surface->FiltersTransform().matrix());
+      damage_rect =
+          filters.MapRect(damage_rect, target_surface->SurfaceScale().matrix());
       damage_for_this_update = DamageAccumulator();
       damage_for_this_update.Union(damage_rect);
     }
   }
 
   // Damage accumulates until we are notified that we actually did draw on that
   // frame.
   current_damage_.Union(damage_for_this_update);
 }
 
@@ skipping 296 matching lines @@
   }
 
   rect->set_x(x_);
   rect->set_y(y_);
   rect->set_width(width.ValueOrDie());
   rect->set_height(height.ValueOrDie());
   return true;
 }
 
 }  // namespace cc