| Index: Source/core/rendering/RenderBlockLineLayout.cpp
|
| diff --git a/Source/core/rendering/RenderBlockLineLayout.cpp b/Source/core/rendering/RenderBlockLineLayout.cpp
|
| index f7b1a33783a456f56acd24316e885001c5e7aca8..939254bccbfbd8692b00e3b93ab2dd60a2cd3e8d 100644
|
| --- a/Source/core/rendering/RenderBlockLineLayout.cpp
|
| +++ b/Source/core/rendering/RenderBlockLineLayout.cpp
|
| @@ -785,7 +785,7 @@ void RenderBlockFlow::layoutRunsAndFloatsInRange(LineLayoutState& layoutState,
|
| InlineBidiResolver& resolver, const InlineIterator& cleanLineStart,
|
| const BidiStatus& cleanLineBidiStatus)
|
| {
|
| - RenderStyle* styleToUse = style();
|
| + const RenderStyle* styleToUse = style();
|
| bool paginated = view()->layoutState() && view()->layoutState()->isPaginated();
|
| LineMidpointState& lineMidpointState = resolver.midpointState();
|
| InlineIterator endOfLine = resolver.position();
|
| @@ -1153,7 +1153,7 @@ static LayoutUnit getBPMWidth(LayoutUnit childValue, Length cssUnit)
|
|
|
| static LayoutUnit getBorderPaddingMargin(RenderBoxModelObject* child, bool endOfInline)
|
| {
|
| - RenderStyle* childStyle = child->style();
|
| + const RenderStyle* childStyle = child->style();
|
| if (endOfInline) {
|
| return getBPMWidth(child->marginEnd(), childStyle->marginEnd()) +
|
| getBPMWidth(child->paddingEnd(), childStyle->paddingEnd()) +
|
| @@ -1211,7 +1211,7 @@ void RenderBlockFlow::computeInlinePreferredLogicalWidths(LayoutUnit& minLogical
|
| FloatWillBeLayoutUnit inlineMax;
|
| FloatWillBeLayoutUnit inlineMin;
|
|
|
| - RenderStyle* styleToUse = style();
|
| + const RenderStyle* styleToUse = style();
|
| RenderBlock* containingBlock = this->containingBlock();
|
| LayoutUnit cw = containingBlock ? containingBlock->contentLogicalWidth() : LayoutUnit();
|
|
|
| @@ -1279,7 +1279,7 @@ void RenderBlockFlow::computeInlinePreferredLogicalWidths(LayoutUnit& minLogical
|
| // values (if any of them are larger than our current min/max). We then look at
|
| // the width of the last non-breakable run and use that to start a new line
|
| // (unless we end in whitespace).
|
| - RenderStyle* childStyle = child->style();
|
| + const RenderStyle* childStyle = child->style();
|
| FloatWillBeLayoutUnit childMin;
|
| FloatWillBeLayoutUnit childMax;
|
|
|
|
|