Index: cc/trees/layer_tree_host_impl.h |
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h |
index 8cb7c5764fe57bd413996fd4976b969097577219..cd46501f7a7337d9e6be494f1cc14b883ca1f63a 100644 |
--- a/cc/trees/layer_tree_host_impl.h |
+++ b/cc/trees/layer_tree_host_impl.h |
@@ -181,7 +181,7 @@ class CC_EXPORT LayerTreeHostImpl |
bool anchor_point, |
float page_scale, |
base::TimeDelta duration); |
- void SetNeedsAnimate() override; |
+ void SetNeedsAnimateInput() override; |
bool IsCurrentlyScrollingLayerAt(const gfx::Point& viewport_point, |
InputHandler::ScrollInputType type) override; |
bool HaveWheelEventHandlersAt(const gfx::Point& viewport_point) override; |
@@ -389,6 +389,7 @@ class CC_EXPORT LayerTreeHostImpl |
bool AnimationsAreVisible() { return visible() && CanDraw(); } |
void SetNeedsCommit() { client_->SetNeedsCommitOnImplThread(); } |
+ void SetNeedsAnimate(); |
void SetNeedsRedraw(); |
ManagedMemoryPolicy ActualManagedMemoryPolicy() const; |
@@ -589,6 +590,7 @@ class CC_EXPORT LayerTreeHostImpl |
// outer if the inner is at its scroll extents. |
void ScrollViewportInnerFirst(gfx::Vector2dF scroll_delta); |
+ void AnimateInput(base::TimeTicks monotonic_time); |
void AnimatePageScale(base::TimeTicks monotonic_time); |
void AnimateScrollbars(base::TimeTicks monotonic_time); |
void AnimateTopControls(base::TimeTicks monotonic_time); |
@@ -688,6 +690,8 @@ class CC_EXPORT LayerTreeHostImpl |
// The optional delegate for the root layer scroll offset. |
LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate_; |
+ LayerScrollOffsetDelegate::AnimationCallback root_layer_animation_callback_; |
+ |
const LayerTreeSettings settings_; |
LayerTreeDebugState debug_state_; |
bool visible_; |