| 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 f3a866d8b38b418020ff2b49560e7f825bac2d0c..222c5b34c8b4242128506525ae2a282b3fb92a38 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
|
| @@ -231,7 +231,7 @@ class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin {
|
| virtual bool scrollAnimatorEnabled() const { return false; }
|
|
|
| // NOTE: Only called from Internals for testing.
|
| - void setScrollOffsetFromInternals(const IntPoint&);
|
| + void updateScrollPositionFromInternals(const IntPoint&);
|
|
|
| IntPoint clampScrollPosition(const IntPoint&) const;
|
| DoublePoint clampScrollPosition(const DoublePoint&) const;
|
| @@ -373,7 +373,7 @@ class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin {
|
| void userScrollHelper(const DoublePoint&, ScrollBehavior);
|
|
|
| // This function should be overriden by subclasses to perform the actual scroll of the content.
|
| - virtual void setScrollOffset(const DoublePoint& offset, ScrollType) = 0;
|
| + virtual void updateScrollPosition(const DoublePoint&, ScrollType) = 0;
|
|
|
| virtual int lineStep(ScrollbarOrientation) const;
|
| virtual int pageStep(ScrollbarOrientation) const;
|
|
|