Chromium Code Reviews| Index: Source/core/frame/RootFrameViewport.h |
| diff --git a/Source/core/frame/RootFrameViewport.h b/Source/core/frame/RootFrameViewport.h |
| index d645de6e0d1453c6b1365348e3ff21f81d159711..a601577710b94b90fd31d0de5b0553d5ad71e2aa 100644 |
| --- a/Source/core/frame/RootFrameViewport.h |
| +++ b/Source/core/frame/RootFrameViewport.h |
| @@ -29,7 +29,7 @@ public: |
| } |
| // ScrollableArea Implementation |
| - void setScrollPosition(const DoublePoint&, ScrollBehavior = ScrollBehaviorInstant) override; |
| + void setScrollPosition(const DoublePoint&, ScrollType, ScrollBehavior = ScrollBehaviorInstant) override; |
| LayoutRect scrollIntoView( |
| const LayoutRect& rectInContent, |
| const ScrollAlignment& alignX, |
| @@ -41,8 +41,8 @@ public: |
| int scrollSize(ScrollbarOrientation) const override; |
| bool isScrollCornerVisible() const override; |
| IntRect scrollCornerRect() const override; |
| - void setScrollOffset(const IntPoint&) override; |
| - void setScrollOffset(const DoublePoint&) override; |
| + void setScrollOffset(const IntPoint&, ScrollType) override; |
| + void setScrollOffset(const DoublePoint&, ScrollType) override; |
| IntPoint scrollPosition() const override; |
| DoublePoint scrollPositionDouble() const override; |
| IntPoint minimumScrollPosition() const override; |
| @@ -68,6 +68,9 @@ public: |
| // call to this class' scroll method. |
| ScrollResult handleWheel(const PlatformWheelEvent&) override; |
| +protected: |
| + virtual ScrollBehavior scrollBehaviorStyle() const override; |
|
skobes
2015/06/04 23:35:47
This should be public, to match its visibility in
bokan
2015/06/05 15:15:23
Done.
bokan
2015/06/05 15:17:25
Should mention: also did this in DPLSA and made DP
|
| + |
| private: |
| RootFrameViewport(ScrollableArea& visualViewport, ScrollableArea& layoutViewport); |