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

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

Issue 1489663003: column-span:all in nested multicol requires re-insertion of fragmentainer groups. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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: third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp
diff --git a/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp b/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp
index 431cc2d01add2ddc30edd287d4dd54ceac1e04bd..4cd074c72a00a4afe1e6a6a5e4bacd52eaeebbc0 100644
--- a/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp
+++ b/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp
@@ -58,7 +58,7 @@ void MultiColumnFragmentainerGroup::resetColumnHeight()
}
}
-bool MultiColumnFragmentainerGroup::recalculateColumnHeight(BalancedColumnHeightCalculation calculationMode)
+bool MultiColumnFragmentainerGroup::recalculateColumnHeight()
{
LayoutUnit oldColumnHeight = m_columnHeight;
@@ -69,7 +69,7 @@ bool MultiColumnFragmentainerGroup::recalculateColumnHeight(BalancedColumnHeight
// passes as well.
if (isLastGroup() && m_columnSet.heightIsAuto()) {
LayoutUnit newColumnHeight;
- if (calculationMode == GuessFromFlowThreadPortion) {
+ if (!m_columnSet.isInitialHeightCalculated()) {
// Initial balancing: Start with the lowest imaginable column height. Also calculate the
// height of the tallest piece of unbreakable content. Columns should never get any
// shorter than that (unless constrained by max-height). Propagate this to our

Powered by Google App Engine
This is Rietveld 408576698