| Index: Source/core/rendering/InlineBox.cpp
|
| diff --git a/Source/core/rendering/InlineBox.cpp b/Source/core/rendering/InlineBox.cpp
|
| index 2ae1a846925c0a342cae3f51279f9d2443dbc09a..c0f47e7c4736ce847e3755a3cf357b4dabc53f2a 100644
|
| --- a/Source/core/rendering/InlineBox.cpp
|
| +++ b/Source/core/rendering/InlineBox.cpp
|
| @@ -121,13 +121,13 @@ float InlineBox::logicalHeight() const
|
| return virtualLogicalHeight();
|
|
|
| if (renderer().isText())
|
| - return m_bitfields.isText() ? renderer().style(isFirstLineStyle())->fontMetrics().height() : 0;
|
| + return m_bitfields.isText() ? renderer().styleOrFirstLineStyle(isFirstLineStyle())->fontMetrics().height() : 0;
|
| if (renderer().isBox() && parent())
|
| return isHorizontal() ? toRenderBox(renderer()).height().toFloat() : toRenderBox(renderer()).width().toFloat();
|
|
|
| ASSERT(isInlineFlowBox());
|
| RenderBoxModelObject* flowObject = boxModelObject();
|
| - const FontMetrics& fontMetrics = renderer().style(isFirstLineStyle())->fontMetrics();
|
| + const FontMetrics& fontMetrics = renderer().styleOrFirstLineStyle(isFirstLineStyle())->fontMetrics();
|
| float result = fontMetrics.height();
|
| if (parent())
|
| result += flowObject->borderAndPaddingLogicalHeight();
|
|
|