Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp |
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp |
index b991948fc11d2ae8bbdbd734b007b4528396ef94..dc8e9bf80d48ee9921ea1c462081ef64e320fc3d 100644 |
--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp |
+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp |
@@ -50,7 +50,7 @@ struct SameSizeAsScrollableArea { |
VerifyEagerFinalization verifyEager; |
#endif |
Member<void*> pointer[2]; |
- unsigned bitfields : 16; |
+ unsigned bitfields : 17; |
IntPoint origin; |
}; |
@@ -78,7 +78,8 @@ ScrollableArea::ScrollableArea() |
m_scrollOriginChanged(false), |
m_horizontalScrollbarNeedsPaintInvalidation(false), |
m_verticalScrollbarNeedsPaintInvalidation(false), |
- m_scrollCornerNeedsPaintInvalidation(false) {} |
+ m_scrollCornerNeedsPaintInvalidation(false), |
+ m_scrollbarsHidden(false) {} |
ScrollableArea::~ScrollableArea() {} |
@@ -528,6 +529,17 @@ bool ScrollableArea::shouldScrollOnMainThread() const { |
return true; |
} |
+bool ScrollableArea::scrollbarsHidden() const { |
+ return hasOverlayScrollbars() && m_scrollbarsHidden; |
+} |
+ |
+void ScrollableArea::setScrollbarsHidden(bool hidden) { |
+ if (m_scrollbarsHidden == hidden) |
+ return; |
+ m_scrollbarsHidden = hidden; |
+ didChangeScrollbarsHidden(); |
+} |
+ |
IntRect ScrollableArea::visibleContentRect( |
IncludeScrollbarsInRect scrollbarInclusion) const { |
int scrollbarWidth = |