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

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: CR fixes Created 7 years, 6 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
Index: Source/core/platform/ScrollableArea.h
diff --git a/Source/core/platform/ScrollableArea.h b/Source/core/platform/ScrollableArea.h
index a3cb10b3fb1aba567e696fa42dc4563b664934d8..5ecc639425993cacb8c5ee8df252b783c5609392 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() { return 40; }
aelias_OOO_until_Jul13 2013/06/20 00:04:14 nit: move the implementations into ScrollableArea.
bokan 2013/06/20 19:00:16 Done.
+ static float minFractionToStepWhenPaging() { return 0.875f; }
+ 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,7 +135,7 @@ public:
virtual Scrollbar* horizontalScrollbar() const { return 0; }
virtual Scrollbar* verticalScrollbar() const { return 0; }
- virtual IntPoint scrollPosition() const;
+ virtual IntPoint scrollPosition() const = 0;
virtual IntPoint minimumScrollPosition() const;
virtual IntPoint maximumScrollPosition() const;
@@ -175,6 +178,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 +210,7 @@ protected:
private:
void scrollPositionChanged(const IntPoint&);
-
+
// NOTE: Only called from the ScrollAnimator.
friend class ScrollAnimator;
void setScrollOffsetFromAnimation(const IntPoint&);
@@ -214,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;

Powered by Google App Engine
This is Rietveld 408576698