Moving RenderSurface creation outside of CalcDrawProps

cc/layers/layer_impl.cc

Index: cc/layers/layer_impl.cc
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 14ffa6f826fc2fd6c41349fec759bcf9a0c50a3c..9083dd5eafac839b3b4aa94cfcf3fcddfb0519b3 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -60,7 +60,6 @@ LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id)
       draw_checkerboard_for_missing_tiles_(false),
       draws_content_(false),
       hide_layer_and_subtree_(false),
-      force_render_surface_(false),
       transform_is_invertible_(true),
       is_container_for_fixed_position_layers_(false),
       background_color_(0),
@@ -238,20 +237,9 @@ void LayerImpl::TakeCopyRequestsAndTransformToTarget(
   layer_tree_impl()->RemoveLayerWithCopyOutputRequest(this);
 }
 
-void LayerImpl::CreateRenderSurface() {
-  DCHECK(!draw_properties_.render_surface);
-  draw_properties_.render_surface =
-      make_scoped_ptr(new RenderSurfaceImpl(this));
-  draw_properties_.render_target = this;
-}
-
-void LayerImpl::ClearRenderSurface() {
-  draw_properties_.render_surface.reset();
-}
-
 void LayerImpl::ClearRenderSurfaceLayerList() {
-  if (draw_properties_.render_surface)
-    draw_properties_.render_surface->layer_list().clear();
+  if (render_surface_)
+    render_surface_->layer_list().clear();
 }
 
 void LayerImpl::PopulateSharedQuadState(SharedQuadState* state) const {
@@ -510,7 +498,6 @@ void LayerImpl::PushPropertiesTo(LayerImpl* layer) {
   layer->SetDoubleSided(double_sided_);
   layer->SetDrawCheckerboardForMissingTiles(
       draw_checkerboard_for_missing_tiles_);
-  layer->SetForceRenderSurface(force_render_surface_);
   layer->SetDrawsContent(DrawsContent());
   layer->SetHideLayerAndSubtree(hide_layer_and_subtree_);
   layer->SetFilters(filters());
@@ -542,6 +529,7 @@ void LayerImpl::PushPropertiesTo(LayerImpl* layer) {
   layer->SetSentScrollDelta(gfx::Vector2d());
   layer->Set3dSortingContextId(sorting_context_id_);
   layer->SetNumDescendantsThatDrawContent(num_descendants_that_draw_content_);
+  layer->SetHasRenderSurface(!!render_surface());
 
   LayerImpl* scroll_parent = NULL;
   if (scroll_parent_) {
@@ -718,8 +706,8 @@ void LayerImpl::ResetAllChangeTrackingForSubtree() {
   update_rect_ = gfx::RectF();
   damage_rect_ = gfx::RectF();
 
-  if (draw_properties_.render_surface)
-    draw_properties_.render_surface->ResetPropertyChangedFlag();
+  if (render_surface_)
+    render_surface_->ResetPropertyChangedFlag();
 
   if (mask_layer_)
     mask_layer_->ResetAllChangeTrackingForSubtree();
@@ -1541,4 +1529,15 @@ void LayerImpl::NotifyAnimationFinished(
     layer_tree_impl_->InputScrollAnimationFinished();
 }
 
+void LayerImpl::SetHasRenderSurface(bool should_have_render_surface) {
+  if (!!render_surface() == should_have_render_surface) {

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

nit: no {}

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

Done.

+    return;
+  }
+  if (should_have_render_surface) {
+    render_surface_ = make_scoped_ptr(new RenderSurfaceImpl(this));
+    return;
+  }
+  render_surface_.reset();
+}
+
 }  // namespace cc