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 8af8c3de3e9d08a16e863256d05906d908fdbfd9..ede7dc3fa277baee8c312965387f3ff4998b9966 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -218,9 +218,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   void SetHideLayerAndSubtree(bool hide);
   bool hide_layer_and_subtree() const { return hide_layer_and_subtree_; }
 
-  bool force_render_surface() const { return force_render_surface_; }
-  void SetForceRenderSurface(bool force) { force_render_surface_ = force; }
-
   void SetTransformOrigin(const gfx::Point3F& transform_origin);
   gfx::Point3F transform_origin() const { return transform_origin_; }
 
@@ -299,9 +296,8 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   // 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 SetHasRenderSurface(bool has_render_surface);
 
   DrawProperties<LayerImpl>& draw_properties() {
     return draw_properties_;
@@ -350,9 +346,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 render_surface_.get(); }

[danakj, 2014/09/03 19:30:33]

nit: move this out of the set of draw_props getters

[awoloszyn, 2014/09/09 15:31:35]

Done.

   int num_unclipped_descendants() const {
     return draw_properties_.num_unclipped_descendants;
   }
@@ -629,7 +623,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   bool draw_checkerboard_for_missing_tiles_ : 1;
   bool draws_content_ : 1;
   bool hide_layer_and_subtree_ : 1;
-  bool force_render_surface_ : 1;
 
   // Cache transform_'s invertibility.
   bool transform_is_invertible_ : 1;
@@ -703,7 +696,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   DrawProperties<LayerImpl> draw_properties_;
 
   scoped_refptr<base::debug::ConvertableToTraceFormat> debug_info_;
-
+  scoped_ptr<RenderSurfaceImpl> render_surface_;
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };