| Index: Source/core/layout/MultiColumnFragmentainerGroup.cpp
|
| diff --git a/Source/core/layout/MultiColumnFragmentainerGroup.cpp b/Source/core/layout/MultiColumnFragmentainerGroup.cpp
|
| index 1b3e317cbe681092ab12cab97850b10a1def8d7f..cc1ccc6e1d432106b02933d82819d53515333797 100644
|
| --- a/Source/core/layout/MultiColumnFragmentainerGroup.cpp
|
| +++ b/Source/core/layout/MultiColumnFragmentainerGroup.cpp
|
| @@ -306,11 +306,11 @@ LayoutUnit MultiColumnFragmentainerGroup::heightAdjustedForRowOffset(LayoutUnit
|
| LayoutUnit MultiColumnFragmentainerGroup::calculateMaxColumnHeight() const
|
| {
|
| RenderBlockFlow* multicolBlock = m_columnSet.multiColumnBlockFlow();
|
| - LayoutStyle* multicolStyle = multicolBlock->style();
|
| + const LayoutStyle& multicolStyle = multicolBlock->styleRef();
|
| LayoutUnit availableHeight = m_columnSet.multiColumnFlowThread()->columnHeightAvailable();
|
| LayoutUnit maxColumnHeight = availableHeight ? availableHeight : LayoutFlowThread::maxLogicalHeight();
|
| - if (!multicolStyle->logicalMaxHeight().isMaxSizeNone()) {
|
| - LayoutUnit logicalMaxHeight = multicolBlock->computeContentLogicalHeight(multicolStyle->logicalMaxHeight(), -1);
|
| + if (!multicolStyle.logicalMaxHeight().isMaxSizeNone()) {
|
| + LayoutUnit logicalMaxHeight = multicolBlock->computeContentLogicalHeight(multicolStyle.logicalMaxHeight(), -1);
|
| if (logicalMaxHeight != -1 && maxColumnHeight > logicalMaxHeight)
|
| maxColumnHeight = logicalMaxHeight;
|
| }
|
|
|