| 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 056c167423acd16e5fa24232b7f112ea984883be..6fae3289a10c565f71f830cf342e42c5af8843fa 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -173,7 +173,8 @@ class CC_EXPORT LayerTreeHostImpl
|
| ScrollStatus ScrollAnimatedBegin(const gfx::Point& viewport_point) override;
|
| InputHandler::ScrollStatus ScrollAnimated(
|
| const gfx::Point& viewport_point,
|
| - const gfx::Vector2dF& scroll_delta) override;
|
| + const gfx::Vector2dF& scroll_delta,
|
| + const ui::LatencyInfo* LatencyInfo) override;
|
| void ApplyScroll(ScrollNode* scroll_node, ScrollState* scroll_state);
|
| InputHandlerScrollResult ScrollBy(ScrollState* scroll_state) override;
|
| bool ScrollVerticallyByPage(const gfx::Point& viewport_point,
|
| @@ -614,7 +615,8 @@ class CC_EXPORT LayerTreeHostImpl
|
| // Returns true if a scroll offset animation is created and false if we scroll
|
| // by the desired amount without an animation.
|
| bool ScrollAnimationCreate(ScrollNode* scroll_node,
|
| - const gfx::Vector2dF& scroll_amount);
|
| + const gfx::Vector2dF& scroll_amount,
|
| + base::TimeTicks original_event_time);
|
|
|
| void SetLayerTreeMutator(std::unique_ptr<LayerTreeMutator> mutator);
|
| LayerTreeMutator* mutator() { return mutator_.get(); }
|
|
|