Index: Source/core/rendering/line/BreakingContextInlineHeaders.h |
diff --git a/Source/core/rendering/line/BreakingContextInlineHeaders.h b/Source/core/rendering/line/BreakingContextInlineHeaders.h |
index 7e9184dc1ddd955f6b1ce72564f78bc0e7deb327..c2689386908db1a3ef46197a4b72bd2e1767a814 100644 |
--- a/Source/core/rendering/line/BreakingContextInlineHeaders.h |
+++ b/Source/core/rendering/line/BreakingContextInlineHeaders.h |
@@ -166,7 +166,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->style(lineInfo.isFirstLine() ? FirstLineStyle : OwnStyle)->lineHeight() != parent->style(lineInfo.isFirstLine() ? FirstLineStyle : OwnStyle)->lineHeight() |
|| flow->style()->verticalAlign() != parent->style()->verticalAlign() |
|| !parent->style()->font().fontMetrics().hasIdenticalAscentDescentAndLineGap(flow->style()->font().fontMetrics()))) |
return true; |
@@ -545,7 +545,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool |
} |
} |
- RenderStyle* style = renderText->style(m_lineInfo.isFirstLine()); |
+ RenderStyle* style = renderText->style(m_lineInfo.isFirstLine() ? FirstLineStyle : OwnStyle); |
const Font& font = style->font(); |
bool isFixedPitch = font.isFixedPitch(); |