Moving RenderSurface creation outside of CalcDrawProps

cc/layers/layer_impl.h

Index: cc/layers/layer_impl.h
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index b09cb3f4970792d56829a9899dcd48d048450527..ec34d44265413ea5a9821e6d8856059e66ddd759 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -300,6 +300,9 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   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_;
@@ -348,9 +351,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
            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;
   }
@@ -704,7 +705,8 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   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);
 };