Moving RenderSurface creation outside of CalcDrawProps

cc/layers/layer.h

 // Copyright 2010 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_H_
 #define CC_LAYERS_LAYER_H_
 
 #include <set>
 #include <string>
 
@@ skipping 236 matching lines @@
   Layer* render_target() {
     DCHECK(!draw_properties_.render_target ||
            draw_properties_.render_target->render_surface());
     return draw_properties_.render_target;
   }
   const Layer* render_target() const {
     DCHECK(!draw_properties_.render_target ||
            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;
   }
 
   void SetScrollOffset(gfx::Vector2d scroll_offset);
   gfx::Vector2d scroll_offset() const { return scroll_offset_; }
   void SetScrollOffsetFromImplSide(const gfx::Vector2d& scroll_offset);
 
   void SetScrollClipLayerId(int clip_layer_id);
   bool scrollable() const { return scroll_clip_layer_id_ != INVALID_ID; }
@@ skipping 99 matching lines @@
   virtual bool IsSuitableForGpuRasterization() const;
 
   virtual scoped_refptr<base::debug::ConvertableToTraceFormat> TakeDebugInfo();
 
   void SetLayerClient(LayerClient* client) { client_ = client; }
 
   virtual void PushPropertiesTo(LayerImpl* 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
   // pixels. The contents scale is 1 for the root layer as it is already in
   // physical pixels. By default contents scale is forced to be 1 except for
   // subclasses of ContentsScalingLayer.
   float contents_scale_x() const { return draw_properties_.contents_scale_x; }
   float contents_scale_y() const { return draw_properties_.contents_scale_y; }
   gfx::Size content_bounds() const { return draw_properties_.content_bounds; }
 
@@ skipping 212 matching lines @@
   bool draws_content_ : 1;
   bool hide_layer_and_subtree_ : 1;
   bool masks_to_bounds_ : 1;
   bool contents_opaque_ : 1;
   bool double_sided_ : 1;
   bool should_flatten_transform_ : 1;
   bool use_parent_backface_visibility_ : 1;
   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_;
   SkColor background_color_;
   float opacity_;
   SkXfermode::Mode blend_mode_;
   FilterOperations filters_;
   FilterOperations background_filters_;
   LayerPositionConstraint position_constraint_;
   Layer* scroll_parent_;
@@ skipping 13 matching lines @@
 
   LayerClient* client_;
 
   ScopedPtrVector<CopyOutputRequest> copy_requests_;
 
   base::Closure did_scroll_callback_;
 
   DrawProperties<Layer> draw_properties_;
 
   PaintProperties paint_properties_;
+  scoped_ptr<RenderSurface> render_surface_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_H_