| Index: Source/core/layout/line/InlineBox.cpp
|
| diff --git a/Source/core/layout/line/InlineBox.cpp b/Source/core/layout/line/InlineBox.cpp
|
| index 7bcf49bbead7b2ff0ddf933db697a56b16552b44..235682b56972ee2159f98d3b5bba02e41d7127e7 100644
|
| --- a/Source/core/layout/line/InlineBox.cpp
|
| +++ b/Source/core/layout/line/InlineBox.cpp
|
| @@ -140,22 +140,22 @@ LayoutUnit InlineBox::logicalHeight() const
|
| return isHorizontal() ? toLayoutBox(layoutObject()).size().height() : toLayoutBox(layoutObject()).size().width();
|
|
|
| ASSERT(isInlineFlowBox());
|
| - LayoutBoxModelObject* flowObject = boxModelObject();
|
| + LineLayoutBoxModel flowObject = boxModelObject();
|
| const FontMetrics& fontMetrics = lineLayoutItem().style(isFirstLineStyle())->fontMetrics();
|
| LayoutUnit result = fontMetrics.height();
|
| if (parent())
|
| - result += flowObject->borderAndPaddingLogicalHeight();
|
| + result += flowObject.borderAndPaddingLogicalHeight();
|
| return result;
|
| }
|
|
|
| int InlineBox::baselinePosition(FontBaseline baselineType) const
|
| {
|
| - return boxModelObject()->baselinePosition(baselineType, m_bitfields.firstLine(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);
|
| + return boxModelObject().baselinePosition(baselineType, m_bitfields.firstLine(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);
|
| }
|
|
|
| LayoutUnit InlineBox::lineHeight() const
|
| {
|
| - return boxModelObject()->lineHeight(m_bitfields.firstLine(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);
|
| + return boxModelObject().lineHeight(m_bitfields.firstLine(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);
|
| }
|
|
|
| int InlineBox::caretMinOffset() const
|
|
|