Index: cc/layers/layer_impl.h |
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h |
index 12f1dcaeeff39c10176523f6d21bbe3bc5d6b2de..1aaf5f2fd3ace537ec85f8c54ac62e455e9090f3 100644 |
--- a/cc/layers/layer_impl.h |
+++ b/cc/layers/layer_impl.h |
@@ -222,9 +222,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_; } |
@@ -303,9 +300,10 @@ 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); |
+ |
+ RenderSurfaceImpl* render_surface() const { return render_surface_.get(); } |
DrawProperties<LayerImpl>& draw_properties() { |
return draw_properties_; |
@@ -357,9 +355,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(); |
- } |
+ |
int num_unclipped_descendants() const { |
return draw_properties_.num_unclipped_descendants; |
} |
@@ -647,7 +643,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; |
@@ -721,7 +716,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); |
}; |