| Index: Source/core/platform/ScrollView.cpp
|
| diff --git a/Source/core/platform/ScrollView.cpp b/Source/core/platform/ScrollView.cpp
|
| index 65c585ee0cd483d843a91e69e366cb80c216e925..7e6be5d7ccc321e7e665f83d814f87ed11a353a9 100644
|
| --- a/Source/core/platform/ScrollView.cpp
|
| +++ b/Source/core/platform/ScrollView.cpp
|
| @@ -212,36 +212,7 @@ IntRect ScrollView::visibleContentRect(VisibleContentRectIncludesScrollbars scol
|
|
|
| IntSize ScrollView::layoutSize(VisibleContentRectIncludesScrollbars scrollbarInclusion) const
|
| {
|
| - return m_fixedLayoutSize.isEmpty() || !m_useFixedLayout ? unscaledVisibleContentSize(scrollbarInclusion) : m_fixedLayoutSize;
|
| -}
|
| -
|
| -IntSize ScrollView::fixedLayoutSize() const
|
| -{
|
| - return m_fixedLayoutSize;
|
| -}
|
| -
|
| -void ScrollView::setFixedLayoutSize(const IntSize& newSize)
|
| -{
|
| - if (fixedLayoutSize() == newSize)
|
| - return;
|
| - m_fixedLayoutSize = newSize;
|
| - updateScrollbars(scrollOffset());
|
| - if (m_useFixedLayout)
|
| - contentsResized();
|
| -}
|
| -
|
| -bool ScrollView::useFixedLayout() const
|
| -{
|
| - return m_useFixedLayout;
|
| -}
|
| -
|
| -void ScrollView::setUseFixedLayout(bool enable)
|
| -{
|
| - if (useFixedLayout() == enable)
|
| - return;
|
| - m_useFixedLayout = enable;
|
| - updateScrollbars(scrollOffset());
|
| - contentsResized();
|
| + return unscaledVisibleContentSize(scrollbarInclusion);
|
| }
|
|
|
| IntSize ScrollView::contentsSize() const
|
|
|