| 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 6af8dd9f00fc8e75b34a4f4b0f68ad32a8dcf950..8add9d2829cd3990422eb2569e9f0541733a2236 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -171,7 +171,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,
|
| + base::TimeDelta delay_in_second = base::TimeDelta()) override;
|
| void ApplyScroll(ScrollNode* scroll_node, ScrollState* scroll_state);
|
| InputHandlerScrollResult ScrollBy(ScrollState* scroll_state) override;
|
| bool ScrollVerticallyByPage(const gfx::Point& viewport_point,
|
| @@ -604,7 +605,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::TimeDelta delayed_by);
|
|
|
| void SetLayerTreeMutator(std::unique_ptr<LayerTreeMutator> mutator);
|
| LayerTreeMutator* mutator() { return mutator_.get(); }
|
| @@ -710,7 +712,8 @@ class CC_EXPORT LayerTreeHostImpl
|
| void ScrollAnimationAbort(LayerImpl* layer_impl);
|
|
|
| bool ScrollAnimationUpdateTarget(ScrollNode* scroll_node,
|
| - const gfx::Vector2dF& scroll_delta);
|
| + const gfx::Vector2dF& scroll_delta,
|
| + base::TimeDelta delayed_by);
|
|
|
| using UIResourceMap = std::unordered_map<UIResourceId, UIResourceData>;
|
| UIResourceMap ui_resource_map_;
|
|
|