Index: Source/core/rendering/RenderLayer.h |
diff --git a/Source/core/rendering/RenderLayer.h b/Source/core/rendering/RenderLayer.h |
index 89c41e6fafa02086a63b0c0102594ad21414a711..4bbbe0dda7812770924b02eb3fe25de22898da91 100644 |
--- a/Source/core/rendering/RenderLayer.h |
+++ b/Source/core/rendering/RenderLayer.h |
@@ -456,14 +456,6 @@ public: |
LayoutRect getRectToExpose(const LayoutRect& visibleRect, const LayoutRect& exposeRect, const ScrollAlignment& alignX, const ScrollAlignment& alignY); |
- bool scrollsOverflow() const; |
- bool hasScrollbars() const { return m_hBar || m_vBar; } |
- void setHasHorizontalScrollbar(bool); |
- void setHasVerticalScrollbar(bool); |
- |
- PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation); |
- void destroyScrollbar(ScrollbarOrientation); |
- |
bool hasHorizontalScrollbar() const { return horizontalScrollbar(); } |
bool hasVerticalScrollbar() const { return verticalScrollbar(); } |
@@ -475,7 +467,6 @@ public: |
int verticalScrollbarWidth(OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const; |
int horizontalScrollbarHeight(OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const; |
- bool hasOverflowControls() const; |
// isPointInResizeControl() is used for testing if a pointer/touch position is in the resize control |
// area. |
bool isPointInResizeControl(const IntPoint& absolutePoint, ResizerHitTestType resizerHitTestType) const; |
@@ -881,6 +872,14 @@ private: |
OnlyStackingContextsCanBeStackingContainers |
}; |
+ void setHasHorizontalScrollbar(bool); |
+ void setHasVerticalScrollbar(bool); |
+ |
+ PassRefPtr<Scrollbar> createScrollbar(ScrollbarOrientation); |
+ void destroyScrollbar(ScrollbarOrientation); |
+ |
+ bool hasOverflowControls() const; |
+ |
void updateZOrderLists(); |
void rebuildZOrderLists(); |
// See the comment for collectLayers for information about the layerToForceAsStackingContainer parameter. |
@@ -1080,6 +1079,8 @@ private: |
virtual bool shouldSuspendScrollAnimations() const; |
virtual bool scrollbarsCanBeActive() const; |
virtual IntRect scrollableAreaBoundingBox() const OVERRIDE; |
+ virtual bool isHorizontallyScrollable() const OVERRIDE; |
+ virtual bool isVerticallyScrollable() const OVERRIDE; |
// Rectangle encompassing the scroll corner and resizer rect. |
IntRect scrollCornerAndResizerRect() const; |