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 3e9379a575e9e4d3e267d9c5daefa81c8c2edf2d..e8a89294b234556fb1657b9f1935f098034b8ddc 100644 |
--- a/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp |
+++ b/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp |
@@ -80,13 +80,9 @@ bool MultiColumnFragmentainerGroup::recalculateColumnHeight( |
// another layout pass with the column height that we just calculated. |
InitialColumnHeightFinder initialHeightFinder( |
columnSet, logicalTopInFlowThread(), logicalBottomInFlowThread()); |
- LayoutUnit tallestUnbreakableLogicalHeight = |
- initialHeightFinder.tallestUnbreakableLogicalHeight(); |
columnSet.propagateTallestUnbreakableLogicalHeight( |
- tallestUnbreakableLogicalHeight); |
- newColumnHeight = |
- std::max(initialHeightFinder.initialMinimalBalancedHeight(), |
- tallestUnbreakableLogicalHeight); |
+ initialHeightFinder.tallestUnbreakableLogicalHeight()); |
+ newColumnHeight = initialHeightFinder.initialMinimalBalancedHeight(); |
} else { |
// Rebalancing: After having laid out again, we'll need to rebalance if |
// the height wasn't enough and we're allowed to stretch it, and then |