Index: Source/core/rendering/RenderMultiColumnSet.cpp |
diff --git a/Source/core/rendering/RenderMultiColumnSet.cpp b/Source/core/rendering/RenderMultiColumnSet.cpp |
index 4ad1c9d855d1defeb150ba44acaf9b931143bee7..d91011fabaf88bab8acc9fa018d7a1430d5e900d 100644 |
--- a/Source/core/rendering/RenderMultiColumnSet.cpp |
+++ b/Source/core/rendering/RenderMultiColumnSet.cpp |
@@ -40,7 +40,7 @@ RenderMultiColumnSet::RenderMultiColumnSet(RenderFlowThread* flowThread) |
{ |
} |
-RenderMultiColumnSet* RenderMultiColumnSet::createAnonymous(RenderFlowThread* flowThread, RenderStyle* parentStyle) |
+RenderMultiColumnSet* RenderMultiColumnSet::createAnonymous(RenderFlowThread* flowThread, const RenderStyle* parentStyle) |
{ |
Document& document = flowThread->document(); |
RenderMultiColumnSet* renderer = new RenderMultiColumnSet(flowThread); |
@@ -333,7 +333,7 @@ void RenderMultiColumnSet::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTo |
LayoutUnit RenderMultiColumnSet::calculateMaxColumnHeight() const |
{ |
RenderBlockFlow* multicolBlock = multiColumnBlockFlow(); |
- RenderStyle* multicolStyle = multicolBlock->style(); |
+ const RenderStyle* multicolStyle = multicolBlock->style(); |
LayoutUnit availableHeight = multiColumnFlowThread()->columnHeightAvailable(); |
LayoutUnit maxColumnHeight = availableHeight ? availableHeight : RenderFlowThread::maxLogicalHeight(); |
if (!multicolStyle->logicalMaxHeight().isMaxSizeNone()) { |