| Index: third_party/WebKit/Source/core/input/ScrollManager.h
|
| diff --git a/third_party/WebKit/Source/core/input/ScrollManager.h b/third_party/WebKit/Source/core/input/ScrollManager.h
|
| index 58e0d140992d04b4893aa3a4d72831e264b4c2b1..c3b064eb50d763d9664f35da68b1a96ebe778c1c 100644
|
| --- a/third_party/WebKit/Source/core/input/ScrollManager.h
|
| +++ b/third_party/WebKit/Source/core/input/ScrollManager.h
|
| @@ -100,7 +100,7 @@ class CORE_EXPORT ScrollManager
|
|
|
| void ClearGestureScrollState();
|
|
|
| - void CustomizedScroll(const Node& start_node, ScrollState&);
|
| + void CustomizedScroll(ScrollState&);
|
|
|
| Page* GetPage() const;
|
|
|
| @@ -109,7 +109,9 @@ class CORE_EXPORT ScrollManager
|
| bool HandleScrollGestureOnResizer(Node*, const WebGestureEvent&);
|
|
|
| void RecomputeScrollChain(const Node& start_node,
|
| + const ScrollState&,
|
| std::deque<int>& scroll_chain);
|
| + bool CanScroll(const ScrollState&, const Element* current_element);
|
|
|
| // scroller_size is set only when scrolling non root scroller.
|
| void ComputeScrollRelatedMetrics(
|
|
|