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

Unified Diff: Source/core/layout/LayoutBlock.cpp

Issue 1236793005: Always include floating children into visual overflow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: NeedsRebaselines (see the try job results of the previous patch set for expectation changes) Created 5 years, 5 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
« no previous file with comments | « Source/core/layout/LayoutBlock.h ('k') | Source/core/layout/LayoutBlockFlow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBlock.cpp
diff --git a/Source/core/layout/LayoutBlock.cpp b/Source/core/layout/LayoutBlock.cpp
index 41e5dd46b4c4c71e193e3292c5d22210824e1702..6ffb90454fdbaa16e7efdbcf18defd118b6e70e0 100644
--- a/Source/core/layout/LayoutBlock.cpp
+++ b/Source/core/layout/LayoutBlock.cpp
@@ -931,7 +931,7 @@ void LayoutBlock::addOverflowFromChildren()
addOverflowFromBlockChildren();
}
-void LayoutBlock::computeOverflow(LayoutUnit oldClientAfterEdge, bool)
+void LayoutBlock::computeOverflow(LayoutUnit oldClientAfterEdge)
{
m_overflow.clear();
@@ -1096,7 +1096,7 @@ bool LayoutBlock::simplifiedLayout()
// computeOverflow expects the bottom edge before we clamp our height. Since this information isn't available during
// simplifiedLayout, we cache the value in m_overflow.
LayoutUnit oldClientAfterEdge = hasOverflowModel() ? m_overflow->layoutClientAfterEdge() : clientLogicalBottom();
- computeOverflow(oldClientAfterEdge, true);
+ computeOverflow(oldClientAfterEdge);
}
updateLayerTransformAfterLayout();
@@ -2818,7 +2818,7 @@ bool LayoutBlock::recalcOverflowAfterStyleChange()
return false;
LayoutUnit oldClientAfterEdge = hasOverflowModel() ? m_overflow->layoutClientAfterEdge() : clientLogicalBottom();
- computeOverflow(oldClientAfterEdge, true);
+ computeOverflow(oldClientAfterEdge);
if (hasOverflowClip())
layer()->scrollableArea()->updateAfterOverflowRecalc();
« no previous file with comments | « Source/core/layout/LayoutBlock.h ('k') | Source/core/layout/LayoutBlockFlow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698