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

Unified Diff: Source/core/platform/ScrollView.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/ScrollAnimator.cpp ('k') | Source/core/platform/ScrollView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/ScrollView.h
diff --git a/Source/core/platform/ScrollView.h b/Source/core/platform/ScrollView.h
index 44180b15c04e44f6852b33943ea1aae624496ff2..7f1dc48c2783c479263a0fc72fc559a128133694 100644
--- a/Source/core/platform/ScrollView.h
+++ b/Source/core/platform/ScrollView.h
@@ -46,10 +46,10 @@ public:
// ScrollableArea functions.
virtual int scrollSize(ScrollbarOrientation) const OVERRIDE;
- virtual int scrollPosition(Scrollbar*) const OVERRIDE;
virtual void setScrollOffset(const IntPoint&) OVERRIDE;
virtual bool isScrollCornerVisible() const OVERRIDE;
virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate) OVERRIDE;
+ virtual bool userInputScrollable(ScrollbarOrientation) const OVERRIDE;
virtual void notifyPageThatContentAreaWillPaint() const;
@@ -111,10 +111,6 @@ public:
// Overridden by FrameView to create custom CSS scrollbars if applicable.
virtual PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
- // If the prohibits scrolling flag is set, then all scrolling in the view (even programmatic scrolling) is turned off.
- void setProhibitsScrolling(bool b) { m_prohibitsScrolling = b; }
- bool prohibitsScrolling() const { return m_prohibitsScrolling; }
-
// Whether or not a scroll view will blit visible contents when it is scrolled. Blitting is disabled in situations
// where it would cause rendering glitches (such as with fixed backgrounds or when the view is partially transparent).
void setCanBlitOnScroll(bool);
@@ -308,8 +304,6 @@ private:
bool m_horizontalScrollbarLock;
bool m_verticalScrollbarLock;
- bool m_prohibitsScrolling;
-
HashSet<RefPtr<Widget> > m_children;
// This bool is unused on Mac OS because we directly ask the platform widget
@@ -345,6 +339,8 @@ private:
void calculateOverhangAreasForPainting(IntRect& horizontalOverhangRect, IntRect& verticalOverhangRect);
void updateOverhangAreas();
+
+ int pageStep(ScrollbarOrientation) const;
}; // class ScrollView
inline ScrollView* toScrollView(Widget* widget)
« no previous file with comments | « Source/core/platform/ScrollAnimator.cpp ('k') | Source/core/platform/ScrollView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698