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 611f24b77fc3db578a919622ffb3643d02f6207d..b803a14e82458a5168f694fbe7d4319d0786a05c 100644 |
--- a/cc/trees/layer_tree_host_impl.h |
+++ b/cc/trees/layer_tree_host_impl.h |
@@ -169,7 +169,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, |
@@ -633,6 +633,13 @@ class CC_EXPORT LayerTreeHostImpl |
BeginFrameTracker current_begin_frame_tracker_; |
private: |
+ bool CalculateLocalScrollDeltaAndStartPoint( |
bokan
2017/06/22 21:44:38
Please add a short description of what this method
sahel
2017/06/23 18:22:04
Done.
|
+ ScrollNode* scroll_node, |
+ const gfx::PointF& viewport_point, |
+ const gfx::Vector2dF& viewport_delta, |
+ ScrollTree* scroll_tree, |
+ gfx::PointF* local_start_point, |
+ gfx::Vector2dF* local_scroll_delta); |
gfx::Vector2dF ScrollNodeWithViewportSpaceDelta( |
ScrollNode* scroll_node, |
const gfx::PointF& viewport_point, |
@@ -664,6 +671,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); |