Index: Source/core/platform/ScrollableArea.h |
diff --git a/Source/core/platform/ScrollableArea.h b/Source/core/platform/ScrollableArea.h |
index a3cb10b3fb1aba567e696fa42dc4563b664934d8..4add2fb86f4d0897cc1cd349342fb178b3ae5d8d 100644 |
--- a/Source/core/platform/ScrollableArea.h |
+++ b/Source/core/platform/ScrollableArea.h |
@@ -40,6 +40,10 @@ class ScrollAnimator; |
class ScrollableArea { |
public: |
+ static int pixelsPerLineStep(); |
+ static float minFractionToStepWhenPaging(); |
+ static int maxOverlapBetweenPages(); |
+ |
bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1); |
void scrollToOffsetWithoutAnimation(const FloatPoint&); |
void scrollToOffsetWithoutAnimation(ScrollbarOrientation, float offset); |
@@ -102,7 +106,6 @@ public: |
virtual bool isActive() const = 0; |
virtual int scrollSize(ScrollbarOrientation) const = 0; |
- virtual int scrollPosition(Scrollbar*) const = 0; |
virtual void invalidateScrollbar(Scrollbar*, const IntRect&); |
virtual bool isScrollCornerVisible() const = 0; |
virtual IntRect scrollCornerRect() const = 0; |
@@ -132,9 +135,11 @@ public: |
virtual Scrollbar* horizontalScrollbar() const { return 0; } |
virtual Scrollbar* verticalScrollbar() const { return 0; } |
- virtual IntPoint scrollPosition() const; |
- virtual IntPoint minimumScrollPosition() const; |
- virtual IntPoint maximumScrollPosition() const; |
+ // scrollPosition is relative to the scrollOrigin. i.e. If the page is RTL |
+ // then scrollPosition will be negative. |
+ virtual IntPoint scrollPosition() const = 0; |
+ virtual IntPoint minimumScrollPosition() const = 0; |
+ virtual IntPoint maximumScrollPosition() const = 0; |
enum VisibleContentRectIncludesScrollbars { ExcludeScrollbars, IncludeScrollbars }; |
virtual IntRect visibleContentRect(VisibleContentRectIncludesScrollbars = ExcludeScrollbars) const; |
@@ -175,6 +180,8 @@ public: |
virtual void reportMemoryUsage(MemoryObjectInfo*) const; |
+ virtual bool userInputScrollable(ScrollbarOrientation) const = 0; |
+ |
// Convenience functions |
int scrollPosition(ScrollbarOrientation orientation) { return orientation == HorizontalScrollbar ? scrollPosition().x() : scrollPosition().y(); } |
int minimumScrollPosition(ScrollbarOrientation orientation) { return orientation == HorizontalScrollbar ? minimumScrollPosition().x() : minimumScrollPosition().y(); } |
@@ -205,7 +212,7 @@ protected: |
private: |
void scrollPositionChanged(const IntPoint&); |
- |
+ |
// NOTE: Only called from the ScrollAnimator. |
friend class ScrollAnimator; |
void setScrollOffsetFromAnimation(const IntPoint&); |
@@ -214,6 +221,11 @@ private: |
// scroll of the content. |
virtual void setScrollOffset(const IntPoint&) = 0; |
+ virtual int lineStep(ScrollbarOrientation) const; |
+ virtual int pageStep(ScrollbarOrientation) const = 0; |
+ virtual int documentStep(ScrollbarOrientation) const; |
+ virtual float pixelStep(ScrollbarOrientation) const; |
+ |
mutable OwnPtr<ScrollAnimator> m_scrollAnimator; |
unsigned m_constrainsScrollingToContentEdge : 1; |