Index: Source/core/rendering/InlineFlowBox.cpp |
diff --git a/Source/core/rendering/InlineFlowBox.cpp b/Source/core/rendering/InlineFlowBox.cpp |
index ce118c53a8b746319f84222b377887f4816f4c34..77835414018e76c165267afb7f16af07169129e5 100644 |
--- a/Source/core/rendering/InlineFlowBox.cpp |
+++ b/Source/core/rendering/InlineFlowBox.cpp |
@@ -120,8 +120,8 @@ void InlineFlowBox::addToLine(InlineBox* child) |
} |
if (descendantsHaveSameLineHeightAndBaseline() && !child->renderer().isOutOfFlowPositioned()) { |
- RenderStyle* parentStyle = renderer().style(isFirstLineStyle()); |
- RenderStyle* childStyle = child->renderer().style(isFirstLineStyle()); |
+ const RenderStyle* parentStyle = renderer().style(isFirstLineStyle()); |
+ const RenderStyle* childStyle = child->renderer().style(isFirstLineStyle()); |
bool shouldClearDescendantsHaveSameLineHeightAndBaseline = false; |
if (child->renderer().isReplaced()) |
shouldClearDescendantsHaveSameLineHeightAndBaseline = true; |
@@ -158,7 +158,7 @@ void InlineFlowBox::addToLine(InlineBox* child) |
if (!child->renderer().isOutOfFlowPositioned()) { |
if (child->isText()) { |
- RenderStyle* childStyle = child->renderer().style(isFirstLineStyle()); |
+ const RenderStyle* childStyle = child->renderer().style(isFirstLineStyle()); |
if (childStyle->letterSpacing() < 0 || childStyle->textShadow() || childStyle->textEmphasisMark() != TextEmphasisMarkNone || childStyle->textStrokeWidth()) |
child->clearKnownToHaveNoOverflow(); |
} else if (child->renderer().isReplaced()) { |
@@ -783,7 +783,7 @@ inline void InlineFlowBox::addBoxShadowVisualOverflow(LayoutRect& logicalVisualO |
if (!parent()) |
return; |
- RenderStyle* style = renderer().style(isFirstLineStyle()); |
+ const RenderStyle* style = renderer().style(isFirstLineStyle()); |
WritingMode writingMode = style->writingMode(); |
ShadowList* boxShadow = style->boxShadow(); |
if (!boxShadow) |
@@ -805,7 +805,7 @@ inline void InlineFlowBox::addBorderOutsetVisualOverflow(LayoutRect& logicalVisu |
if (!parent()) |
return; |
- RenderStyle* style = renderer().style(isFirstLineStyle()); |
+ const RenderStyle* style = renderer().style(isFirstLineStyle()); |
if (!style->hasBorderImageOutsets()) |
return; |
@@ -829,7 +829,7 @@ inline void InlineFlowBox::addOutlineVisualOverflow(LayoutRect& logicalVisualOve |
if (!parent()) |
return; |
- RenderStyle* style = renderer().style(isFirstLineStyle()); |
+ const RenderStyle* style = renderer().style(isFirstLineStyle()); |
if (!style->hasOutline()) |
return; |
@@ -841,7 +841,7 @@ inline void InlineFlowBox::addTextBoxVisualOverflow(InlineTextBox* textBox, Glyp |
if (textBox->knownToHaveNoOverflow()) |
return; |
- RenderStyle* style = textBox->renderer().style(isFirstLineStyle()); |
+ const RenderStyle* style = textBox->renderer().style(isFirstLineStyle()); |
GlyphOverflowAndFallbackFontsMap::iterator it = textBoxDataMap.find(textBox); |
GlyphOverflow* glyphOverflow = it == textBoxDataMap.end() ? 0 : &it->value.second; |
@@ -1196,7 +1196,7 @@ LayoutUnit InlineFlowBox::computeOverAnnotationAdjustment(LayoutUnit allowedPosi |
} |
if (curr->isInlineTextBox()) { |
- RenderStyle* style = curr->renderer().style(isFirstLineStyle()); |
+ const RenderStyle* style = curr->renderer().style(isFirstLineStyle()); |
TextEmphasisPosition emphasisMarkPosition; |
if (style->textEmphasisMark() != TextEmphasisMarkNone && toInlineTextBox(curr)->getEmphasisMarkPosition(style, emphasisMarkPosition) && emphasisMarkPosition == TextEmphasisPositionOver) { |
if (!style->isFlippedLinesWritingMode()) { |
@@ -1244,7 +1244,7 @@ LayoutUnit InlineFlowBox::computeUnderAnnotationAdjustment(LayoutUnit allowedPos |
} |
if (curr->isInlineTextBox()) { |
- RenderStyle* style = curr->renderer().style(isFirstLineStyle()); |
+ const RenderStyle* style = curr->renderer().style(isFirstLineStyle()); |
if (style->textEmphasisMark() != TextEmphasisMarkNone && style->textEmphasisPosition() == TextEmphasisPositionUnder) { |
if (!style->isFlippedLinesWritingMode()) { |
LayoutUnit bottomOfEmphasisMark = curr->logicalBottom() + style->font().emphasisMarkHeight(style->textEmphasisMarkString()); |