Chromium Code Reviews| Index: Source/core/platform/ScrollView.cpp |
| diff --git a/Source/core/platform/ScrollView.cpp b/Source/core/platform/ScrollView.cpp |
| index 2347bfda5e1f35449ae8be5b15cbde0643e95303..c5107d6205c7bfb903352c13a0912f9763396af7 100644 |
| --- a/Source/core/platform/ScrollView.cpp |
| +++ b/Source/core/platform/ScrollView.cpp |
| @@ -214,7 +214,11 @@ IntRect ScrollView::visibleContentRect(VisibleContentRectIncludesScrollbars scol |
| IntSize ScrollView::layoutSize(VisibleContentRectIncludesScrollbars scrollbarInclusion) const |
| { |
| - return m_fixedLayoutSize.isEmpty() || !m_useFixedLayout ? unscaledVisibleContentSize(scrollbarInclusion) : m_fixedLayoutSize; |
| + if (m_useFixedLayout) { |
| + ASSERT(!m_fixedLayoutSize.isEmpty()); |
|
aelias_OOO_until_Jul13
2013/05/29 18:47:28
This subtly changes the behavior in a way that mig
|
| + return m_fixedLayoutSize; |
| + } |
| + return unscaledVisibleContentSize(scrollbarInclusion); |
| } |
| IntSize ScrollView::fixedLayoutSize() const |