| Index: Source/core/frame/RootFrameViewport.h
|
| diff --git a/Source/core/frame/RootFrameViewport.h b/Source/core/frame/RootFrameViewport.h
|
| index d645de6e0d1453c6b1365348e3ff21f81d159711..32ead2e079d8c45b9fc185ecbf15bc42d4649a52 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;
|
| @@ -63,6 +63,7 @@ public:
|
| bool scrollAnimatorEnabled() const override;
|
| HostWindow* hostWindow() const override;
|
| void serviceScrollAnimations(double) override;
|
| + virtual ScrollBehavior scrollBehaviorStyle() const override;
|
| // TODO(bokan): This method should be removed. It should be replaced by
|
| // making EventHandler::handleWheelEvent unpack the WheelEvent and make a
|
| // call to this class' scroll method.
|
|
|