| Index: trunk/Source/core/layout/MultiColumnFragmentainerGroup.cpp
|
| ===================================================================
|
| --- trunk/Source/core/layout/MultiColumnFragmentainerGroup.cpp (revision 190671)
|
| +++ trunk/Source/core/layout/MultiColumnFragmentainerGroup.cpp (working copy)
|
| @@ -306,11 +306,11 @@
|
| LayoutUnit MultiColumnFragmentainerGroup::calculateMaxColumnHeight() const
|
| {
|
| RenderBlockFlow* multicolBlock = m_columnSet.multiColumnBlockFlow();
|
| - const LayoutStyle& multicolStyle = multicolBlock->styleRef();
|
| + LayoutStyle* multicolStyle = multicolBlock->style();
|
| 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;
|
| }
|
|
|