| Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| index ae66857d9664c7e5183f534e38d0c7996573555b..1878aed0040caf1982cd3ed901de239c95af20b6 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| @@ -53,6 +53,7 @@ class ProgrammaticScrollAnimator;
|
| struct ScrollAlignment;
|
| class ScrollAnchor;
|
| class ScrollAnimatorBase;
|
| +class SmoothScrollSequencer;
|
| class CompositorAnimationTimeline;
|
|
|
| enum IncludeScrollbarsInRect {
|
| @@ -77,6 +78,10 @@ class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin,
|
|
|
| virtual PlatformChromeClient* GetChromeClient() const { return 0; }
|
|
|
| + virtual SmoothScrollSequencer* GetSmoothScrollSequencer() const {
|
| + return nullptr;
|
| + }
|
| +
|
| virtual ScrollResult UserScroll(ScrollGranularity, const ScrollOffset&);
|
|
|
| virtual void SetScrollOffset(const ScrollOffset&,
|
| @@ -99,6 +104,7 @@ class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin,
|
| virtual LayoutRect ScrollIntoView(const LayoutRect& rect_in_content,
|
| const ScrollAlignment& align_x,
|
| const ScrollAlignment& align_y,
|
| + bool is_smooth,
|
| ScrollType = kProgrammaticScroll);
|
|
|
| static bool ScrollBehaviorFromString(const String&, ScrollBehavior&);
|
| @@ -412,7 +418,7 @@ class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin,
|
| virtual void ScrollbarVisibilityChanged() {}
|
|
|
| private:
|
| - void ProgrammaticScrollHelper(const ScrollOffset&, ScrollBehavior);
|
| + void ProgrammaticScrollHelper(const ScrollOffset&, ScrollBehavior, bool);
|
| void UserScrollHelper(const ScrollOffset&, ScrollBehavior);
|
|
|
| void FadeOverlayScrollbarsTimerFired(TimerBase*);
|
|
|