Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1245)

Unified Diff: Source/core/platform/ScrollView.cpp

Issue 14766010: Clarify the size of a document view (a.k.a layout size) that causes FrameView to emit the resize ev… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: patch for review Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« Source/core/page/FrameView.cpp ('K') | « Source/core/page/FrameView.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« Source/core/page/FrameView.cpp ('K') | « Source/core/page/FrameView.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698