Moving RenderSurface creation outside of CalcDrawProps

cc/layers/layer.h

Index: cc/layers/layer.h
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 61ef3f8c3ac701b0b89f87fc74886a2189665774..25893717c9d642dd5ec4587921efe17b700bf8b7 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -254,9 +254,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
            draw_properties_.render_target->render_surface());
     return draw_properties_.render_target;
   }
-  RenderSurface* render_surface() const {
-    return draw_properties_.render_surface.get();
-  }
+  RenderSurface* render_surface() const { return render_surface_.get(); }

[danakj, 2014/08/26 18:06:13]

nit: can you move this out of the middle of the draw_props accessors?

[awoloszyn, 2014/08/28 19:31:42]

Done.

   int num_unclipped_descendants() const {
     return draw_properties_.num_unclipped_descendants;
   }
@@ -376,6 +374,11 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
 
   void CreateRenderSurface();
   void ClearRenderSurface();
+
+  void SetShouldHaveRenderSurface(bool should_have);
+  void SetRenderSurfaceActive(bool active);

[danakj, 2014/08/26 18:06:13]

Should we get rid of {Create,Clear}RenderSurface then? I don't like having 2
ways to do the same thing. Or not add this one?

[awoloszyn, 2014/08/28 19:31:43]

This one is a bit tricky. RenderSurfaces get destroyed as soon as the rssl goes
out of scope in UpdateDrawProperties, so we no longer have a render-surface when
we go to PushProperties, so we have a separate bool to determine whether or not
we should be letting the impl-side know whether or not it needs one. I could
probably re-work this to SetHasRenderSurface(true/false) and a separate
ClearRenderSurface, which only reset's the render_surface_ ptr. Will definitely
remove the SetShouldHaveRenderSurface and SetRenderSurfaceActive

+  bool ShouldHaveRenderSurface() { return should_have_render_surface_; }
+
   void ClearRenderSurfaceLayerList();
 
   // The contents scale converts from logical, non-page-scaled pixels to target
@@ -608,6 +611,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
   bool draw_checkerboard_for_missing_tiles_ : 1;
   bool force_render_surface_ : 1;
   bool transform_is_invertible_ : 1;
+  bool should_have_render_surface_ : 1;
   Region non_fast_scrollable_region_;
   Region touch_event_handler_region_;
   gfx::PointF position_;
@@ -641,6 +645,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
   DrawProperties<Layer> draw_properties_;
 
   PaintProperties paint_properties_;
+  scoped_ptr<RenderSurface> render_surface_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };