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

Unified Diff: Source/core/layout/LayoutBlockFlow.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/LayoutBlockFlow.h ('k') | Source/core/layout/LayoutTableSection.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBlockFlow.cpp
diff --git a/Source/core/layout/LayoutBlockFlow.cpp b/Source/core/layout/LayoutBlockFlow.cpp
index 6def5acfdc7522184a2e0f307299ee1f25724e05..7bb4ad9a4e9ae66c2556691244488868a59f3069 100644
--- a/Source/core/layout/LayoutBlockFlow.cpp
+++ b/Source/core/layout/LayoutBlockFlow.cpp
@@ -1699,11 +1699,10 @@ void LayoutBlockFlow::addOverflowFromFloats()
}
}
-void LayoutBlockFlow::computeOverflow(LayoutUnit oldClientAfterEdge, bool recomputeFloats)
+void LayoutBlockFlow::computeOverflow(LayoutUnit oldClientAfterEdge)
{
- LayoutBlock::computeOverflow(oldClientAfterEdge, recomputeFloats);
- if (recomputeFloats || createsNewFormattingContext() || hasSelfPaintingLayer())
- addOverflowFromFloats();
+ LayoutBlock::computeOverflow(oldClientAfterEdge);
+ addOverflowFromFloats();
}
RootInlineBox* LayoutBlockFlow::createAndAppendRootInlineBox()
« no previous file with comments | « Source/core/layout/LayoutBlockFlow.h ('k') | Source/core/layout/LayoutTableSection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698