Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1184)

Unified Diff: Source/core/platform/ScrollableArea.h

Issue 16982005: Allow objects without scrollbars to be scrollable (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed ScrollbarGroup pageStep Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/platform/ScrollView.cpp ('k') | Source/core/platform/ScrollableArea.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/ScrollableArea.h
diff --git a/Source/core/platform/ScrollableArea.h b/Source/core/platform/ScrollableArea.h
index 4590a98f5dd8250b29d1443ffb056e9eb119df4f..0f2bf5f8094f38c6d7b8d8465d7771228ac3e57a 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;
@@ -173,6 +178,8 @@ public:
virtual bool usesCompositedScrolling() const { return false; }
virtual void updateNeedsCompositedScrolling() { }
+ 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(); }
@@ -212,6 +219,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;
« no previous file with comments | « Source/core/platform/ScrollView.cpp ('k') | Source/core/platform/ScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698