| Index: Source/core/rendering/line/BreakingContextInlineHeaders.h
|
| diff --git a/Source/core/rendering/line/BreakingContextInlineHeaders.h b/Source/core/rendering/line/BreakingContextInlineHeaders.h
|
| index cd08486c690ef85c33bf80b0de17f53c53b2343d..9722c345101195feaf6f3ae6d1f0d2a2c5a415de 100644
|
| --- a/Source/core/rendering/line/BreakingContextInlineHeaders.h
|
| +++ b/Source/core/rendering/line/BreakingContextInlineHeaders.h
|
| @@ -165,7 +165,7 @@ inline bool requiresLineBoxForContent(RenderInline* flow, const LineInfo& lineIn
|
| {
|
| RenderObject* parent = flow->parent();
|
| if (flow->document().inNoQuirksMode()
|
| - && (flow->style(lineInfo.isFirstLine())->lineHeight() != parent->style(lineInfo.isFirstLine())->lineHeight()
|
| + && (flow->styleOrFirstLineStyle(lineInfo.isFirstLine())->lineHeight() != parent->styleOrFirstLineStyle(lineInfo.isFirstLine())->lineHeight()
|
| || flow->style()->verticalAlign() != parent->style()->verticalAlign()
|
| || !parent->style()->font().fontMetrics().hasIdenticalAscentDescentAndLineGap(flow->style()->font().fontMetrics())))
|
| return true;
|
| @@ -544,7 +544,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool
|
| }
|
| }
|
|
|
| - RenderStyle* style = renderText->style(m_lineInfo.isFirstLine());
|
| + RenderStyle* style = renderText->styleOrFirstLineStyle(m_lineInfo.isFirstLine());
|
| const Font& font = style->font();
|
| bool isFixedPitch = font.isFixedPitch();
|
|
|
|
|