| 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
|
|
|