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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

Issue 2762483002: Need to notify the multicol machinery when floats have been laid out. (Closed)
Patch Set: Created 3 years, 9 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 | « third_party/WebKit/LayoutTests/fast/multicol/float-margin-at-row-boundary-fixed-multicol-height-expected.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
index 9a0a90f993fd03c929f4d54c7b9a85bba2ee6781..fc16ae42919410f28b7c7f106eb03012e42d3541 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
@@ -3737,6 +3737,8 @@ LayoutUnit LayoutBlockFlow::positionAndLayoutFloat(
child.layoutIfNeeded();
if (isPaginated) {
+ paginatedContentWasLaidOut(child.logicalBottom());
+
// We may have to insert a break before the float.
LayoutUnit newLogicalTopMarginEdge =
adjustFloatLogicalTopForPagination(child, logicalTopMarginEdge);
@@ -3757,6 +3759,7 @@ LayoutUnit LayoutBlockFlow::positionAndLayoutFloat(
if (child.isLayoutBlock())
child.setChildNeedsLayout(MarkOnlyThis);
child.layoutIfNeeded();
+ paginatedContentWasLaidOut(child.logicalBottom());
}
}
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/multicol/float-margin-at-row-boundary-fixed-multicol-height-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698