Moving RenderSurface creation outside of CalcDrawProps

cc/layers/layer_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_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <set>
 #include <string>
 
@@ skipping 282 matching lines @@
   }
 
   bool ShowDebugBorders() const;
 
   // These invalidate the host's render surface layer list.  The caller
   // is responsible for calling set_needs_update_draw_properties on the tree
   // so that its list can be recreated.
   void CreateRenderSurface();
   void ClearRenderSurface();
   void ClearRenderSurfaceLayerList();
+  void SetRenderSurfaceActive(bool active);
+  bool ShouldHaveRenderSurface() { return (render_surface_); }
+  void SetShouldHaveRenderSurface(bool should_have_render_surface);
 
   DrawProperties<LayerImpl>& draw_properties() {
     return draw_properties_;
   }
   const DrawProperties<LayerImpl>& draw_properties() const {
     return draw_properties_;
   }
 
   // The following are shortcut accessors to get various information from
   // draw_properties_
@@ skipping 28 matching lines @@
   LayerImpl* render_target() {
     DCHECK(!draw_properties_.render_target ||
            draw_properties_.render_target->render_surface());
     return draw_properties_.render_target;
   }
   const LayerImpl* render_target() const {
     DCHECK(!draw_properties_.render_target ||
            draw_properties_.render_target->render_surface());
     return draw_properties_.render_target;
   }
-  RenderSurfaceImpl* render_surface() const {
-    return draw_properties_.render_surface.get();
-  }
+  RenderSurfaceImpl* render_surface() const { return active_render_surface_; }
   int num_unclipped_descendants() const {
     return draw_properties_.num_unclipped_descendants;
   }
 
   // The client should be responsible for setting bounds, content bounds and
   // contents scale to appropriate values. LayerImpl doesn't calculate any of
   // them from the other values.
 
   void SetBounds(const gfx::Size& bounds);
   void SetTemporaryImplBounds(const gfx::SizeF& bounds);
@@ skipping 333 matching lines @@
 
   scoped_ptr<ScrollbarSet> scrollbars_;
 
   ScopedPtrVector<CopyOutputRequest> copy_requests_;
 
   // Group of properties that need to be computed based on the layer tree
   // hierarchy before layers can be drawn.
   DrawProperties<LayerImpl> draw_properties_;
 
   scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_;
-
+  scoped_ptr<RenderSurfaceImpl> render_surface_;
+  RenderSurfaceImpl* active_render_surface_;
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_