| 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 07405dc54e35e710e0d4914dfcf5e8b1cc418aee..2cb7b190e62d1421769a0cf6b982e55a5b287298 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -170,7 +170,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| InputHandler::ScrollStatus RootScrollBegin(
|
| ScrollState* scroll_state,
|
| InputHandler::ScrollInputType type) override;
|
| - ScrollStatus ScrollAnimatedBegin(const gfx::Point& viewport_point) override;
|
| + ScrollStatus ScrollAnimatedBegin(ScrollState* scroll_state) override;
|
| InputHandler::ScrollStatus ScrollAnimated(
|
| const gfx::Point& viewport_point,
|
| const gfx::Vector2dF& scroll_delta,
|
| @@ -665,6 +665,8 @@ class CC_EXPORT LayerTreeHostImpl
|
| InputHandler::ScrollInputType type);
|
| bool IsInitialScrollHitTestReliable(LayerImpl* layer, const gfx::PointF&);
|
| void DistributeScrollDelta(ScrollState* scroll_state);
|
| + bool CanConsumeDelta(ScrollNode* scroll_node,
|
| + const ScrollState& scroll_state);
|
|
|
| bool AnimatePageScale(base::TimeTicks monotonic_time);
|
| bool AnimateScrollbars(base::TimeTicks monotonic_time);
|
|
|