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

Unified Diff: Source/core/frame/FrameView.cpp

Issue 911083002: Carry out a resize even if no layout has been performed. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added comment to unit test Created 5 years, 10 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
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 27f746bed86e6caa4dd6ac1c737daa4c888f456a..488cf66d086e3567d278832b94fa6a55d1903c52 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -1606,7 +1606,10 @@ void FrameView::setElasticOverscroll(const FloatSize& elasticOverscroll)
IntSize FrameView::layoutSize(IncludeScrollbarsInRect scrollbarInclusion) const
{
- return scrollbarInclusion == ExcludeScrollbars ? excludeScrollbars(m_layoutSize) : m_layoutSize;
+ IntSize ret = scrollbarInclusion == ExcludeScrollbars ? excludeScrollbars(m_layoutSize) : m_layoutSize;
+ if (m_frame->settings()->forceZeroLayoutHeight())
+ ret.setHeight(0);
+ return ret;
}
void FrameView::setLayoutSize(const IntSize& size)
@@ -3066,6 +3069,11 @@ void FrameView::setLayoutSizeInternal(const IntSize& size)
contentsResized();
}
+void FrameView::didChangeForceLayoutHeightMode()
+{
+ contentsResized();
+}
+
void FrameView::didAddScrollbar(Scrollbar* scrollbar, ScrollbarOrientation orientation)
{
ScrollableArea::didAddScrollbar(scrollbar, orientation);

Powered by Google App Engine
This is Rietveld 408576698