Introduce maxColumnLogicalHeight() and clean up a little.

third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp

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 5f80a52b32a94f8184901ffd5daea61c211e863b..0f58fcefb2f47427dee04a82f6e45825e6635c00 100644
--- a/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp
+++ b/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.cpp
@@ -298,16 +298,8 @@ LayoutUnit MultiColumnFragmentainerGroup::heightAdjustedForRowOffset(LayoutUnit
 
 LayoutUnit MultiColumnFragmentainerGroup::calculateMaxColumnHeight() const
 {
-    LayoutBlockFlow* multicolBlock = m_columnSet.multiColumnBlockFlow();
-    const ComputedStyle& multicolStyle = multicolBlock->styleRef();
     LayoutMultiColumnFlowThread* flowThread = m_columnSet.multiColumnFlowThread();
-    LayoutUnit availableHeight = flowThread->columnHeightAvailable();
-    LayoutUnit maxColumnHeight = availableHeight ? availableHeight : LayoutUnit::max();
-    if (!multicolStyle.logicalMaxHeight().isMaxSizeNone()) {
-        LayoutUnit logicalMaxHeight = multicolBlock->computeContentLogicalHeight(MaxSize, multicolStyle.logicalMaxHeight(), LayoutUnit(-1));
-        if (logicalMaxHeight != -1 && maxColumnHeight > logicalMaxHeight)
-            maxColumnHeight = logicalMaxHeight;
-    }
+    LayoutUnit maxColumnHeight = flowThread->maxColumnLogicalHeight();
     LayoutUnit maxHeight = heightAdjustedForRowOffset(maxColumnHeight);
     if (FragmentationContext* enclosingFragmentationContext = flowThread->enclosingFragmentationContext()) {
         if (enclosingFragmentationContext->isFragmentainerLogicalHeightKnown()) {