Revert of cc: Remove more references to owning_layer_ from RenderSurfaceImpl

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 345 matching lines @@
   //              changes to their entire subtree.
   //        - just like layers, both the old surface rect and new surface rect
   //          will damage the target surface in this case.
   //
   //   2. Damage rect: This surface may have been damaged by its own layer_list
   //      as well, and that damage should propagate to the target surface.
   //
 
   bool surface_is_new = false;
   SurfaceRectMapData& data =
-      RectDataForSurface(render_surface->id(), &surface_is_new);
+      RectDataForSurface(render_surface->OwningLayerId(), &surface_is_new);
   gfx::Rect old_surface_rect = data.rect_;
 
   gfx::Rect surface_rect_in_target_space =
       gfx::ToEnclosingRect(render_surface->DrawableContentRect());
   data.Update(surface_rect_in_target_space, mailboxId_);
 
   if (surface_is_new || render_surface->SurfacePropertyChanged()) {
     // The entire surface contributes damage.
     target_damage_rect->Union(surface_rect_in_target_space);
 
@@ skipping 22 matching lines @@
   // used for the blur in this layer this frame.
   const FilterOperations& background_filters =
       render_surface->BackgroundFilters();
   if (background_filters.HasFilterThatMovesPixels()) {
     ExpandDamageRectInsideRectWithFilters(
         target_damage_rect, surface_rect_in_target_space, background_filters);
   }
 }
 
 }  // namespace cc