| 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 73ed039e582363026274a82024477ab30b26ad71..813198566ccbc607e21ad67d9d7b74224776da80 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -163,7 +163,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;
|
| @@ -361,6 +361,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| bool AnimationsAreVisible() { return visible() && CanDraw(); }
|
|
|
| void SetNeedsCommit() { client_->SetNeedsCommitOnImplThread(); }
|
| + void SetNeedsAnimate();
|
| void SetNeedsRedraw();
|
|
|
| ManagedMemoryPolicy ActualManagedMemoryPolicy() const;
|
| @@ -555,6 +556,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| // Scroll by preferring to move the inner viewport first, only moving the
|
| // 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);
|
| @@ -653,6 +655,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_;
|
| +
|
| LayerTreeSettings settings_;
|
| LayerTreeDebugState debug_state_;
|
| bool visible_;
|
|
|