Index: cc/layers/layer_impl.h |
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h |
index 71e1b9ceb248d6da11921f2a5205a60057a0d856..d483cb3bd6425dc0c43d7e1732f4ee3f23d5ef51 100644 |
--- a/cc/layers/layer_impl.h |
+++ b/cc/layers/layer_impl.h |
@@ -202,7 +202,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
// For compatibility with Layer. |
bool has_render_surface() const { return !!render_surface(); } |
- |
+ bool force_render_surface() const { return force_render_surface_; } |
void SetNumDescendantsThatDrawContent(int num_descendants); |
void SetClipParent(LayerImpl* ancestor); |
@@ -380,6 +380,8 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
void ClearRenderSurfaceLayerList(); |
void SetHasRenderSurface(bool has_render_surface); |
+ void SetForceRenderSurface(bool has_render_surface); |
+ |
RenderSurfaceImpl* render_surface() const { return render_surface_.get(); } |
DrawProperties& draw_properties() { return draw_properties_; } |
@@ -528,6 +530,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
bool HasPotentiallyRunningTransformAnimation() const; |
bool TransformIsAnimatingOnImplOnly() const; |
bool HasOnlyTranslationTransforms() const; |
+ bool AnimationsPreserveAxisAlignment() const; |
void SetTransformAndInvertibility(const gfx::Transform& transform, |
bool transform_is_invertible); |
bool transform_is_invertible() const { return transform_is_invertible_; } |
@@ -865,6 +868,8 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver, |
scoped_refptr<base::trace_event::ConvertableToTraceFormat> debug_info_; |
scoped_ptr<RenderSurfaceImpl> render_surface_; |
+ bool force_render_surface_; |
+ |
std::vector<FrameTimingRequest> frame_timing_requests_; |
int num_layer_or_descendants_with_copy_request_; |
bool frame_timing_requests_dirty_; |