Reland of cc: Remove more references to owning_layer_ from RenderSurfaceImpl

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 <stddef.h>
 
 #include <memory>
@@ skipping 13 matching lines @@
 
 namespace cc {
 
 class DamageTracker;
 class FilterOperations;
 class Occlusion;
 class RenderPassId;
 class RenderPassSink;
 class LayerImpl;
 class LayerIterator;
+class LayerTreeImpl;
 
 struct AppendQuadsData;
 
 class CC_EXPORT RenderSurfaceImpl {
  public:
   explicit RenderSurfaceImpl(LayerImpl* owning_layer);
   virtual ~RenderSurfaceImpl();
 
   // Returns the RenderSurfaceImpl that this render surface contributes to. Root
   // render surface's render_target is itself.
@@ skipping 73 matching lines @@
   const Occlusion& occlusion_in_content_space() const {
     return occlusion_in_content_space_;
   }
   void set_occlusion_in_content_space(const Occlusion& occlusion) {
     occlusion_in_content_space_ = occlusion;
   }
 
   LayerImplList& layer_list() { return layer_list_; }
   void ClearLayerLists();
 
-  int OwningLayerId() const;
+  int id() const { return stable_effect_id_; }
 
   LayerImpl* MaskLayer();
   bool HasMask() const;
 
   const FilterOperations& Filters() const;
   const FilterOperations& BackgroundFilters() const;
   gfx::PointF FiltersOrigin() const;
   gfx::Transform FiltersTransform() const;
 
   bool HasCopyRequest() const;
@@ skipping 16 matching lines @@
   int EffectTreeIndex() const;
 
  private:
   void SetContentRect(const gfx::Rect& content_rect);
   gfx::Rect CalculateClippedAccumulatedContentRect();
 
   const EffectNode* OwningEffectNode() const;
 
   LayerImpl* owning_layer_;
 
+  LayerTreeImpl* layer_tree_impl_;
+  int stable_effect_id_;
+
   // Container for properties that render surfaces need to compute before they
   // can be drawn.
   struct DrawProperties {
     DrawProperties();
     ~DrawProperties();
 
     float draw_opacity;
 
     // Transforms from the surface's own space to the space of its target
     // surface.
@@ skipping 33 matching lines @@
   int target_render_surface_layer_index_history_;
   size_t current_layer_index_history_;
 
   friend class LayerIterator;
 
   DISALLOW_COPY_AND_ASSIGN(RenderSurfaceImpl);
 };
 
 }  // namespace cc
 #endif  // CC_LAYERS_RENDER_SURFACE_IMPL_H_