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

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: 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/ScrollView.h
diff --git a/Source/core/platform/ScrollView.h b/Source/core/platform/ScrollView.h
index 5220122793ba0c64bbf9c9591ea9f7ca1aa8079c..7e069bafdd97ceb556463dacbaf7ef361ce61eb1 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;
@@ -113,10 +113,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);
@@ -310,8 +306,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
@@ -368,6 +362,8 @@ private:
void calculateOverhangAreasForPainting(IntRect& horizontalOverhangRect, IntRect& verticalOverhangRect);
void updateOverhangAreas();
+
+ int pageStep(ScrollbarOrientation) const;
}; // class ScrollView
inline ScrollView* toScrollView(Widget* widget)

Powered by Google App Engine
This is Rietveld 408576698