| Index: Source/core/platform/ScrollView.h
|
| diff --git a/Source/core/platform/ScrollView.h b/Source/core/platform/ScrollView.h
|
| index 5220122793ba0c64bbf9c9591ea9f7ca1aa8079c..b85ae816affd35dfdb0cb996c43097c477335d21 100644
|
| --- a/Source/core/platform/ScrollView.h
|
| +++ b/Source/core/platform/ScrollView.h
|
| @@ -50,6 +50,8 @@ public:
|
| virtual void setScrollOffset(const IntPoint&) OVERRIDE;
|
| virtual bool isScrollCornerVisible() const OVERRIDE;
|
| virtual void scrollbarStyleChanged(int newStyle, bool forceUpdate) OVERRIDE;
|
| + virtual bool isHorizontallyScrollable() const OVERRIDE;
|
| + virtual bool isVerticallyScrollable() const OVERRIDE;
|
|
|
| virtual void notifyPageThatContentAreaWillPaint() const;
|
|
|
| @@ -113,10 +115,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 +308,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
|
|
|