summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/InlineBox.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/rendering/InlineBox.cpp')
-rw-r--r--WebCore/rendering/InlineBox.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/rendering/InlineBox.cpp b/WebCore/rendering/InlineBox.cpp
index 91cbaff..2028d4e 100644
--- a/WebCore/rendering/InlineBox.cpp
+++ b/WebCore/rendering/InlineBox.cpp
@@ -95,14 +95,14 @@ int InlineBox::logicalHeight() const
if (renderer()->isText())
return m_isText ? renderer()->style(m_firstLine)->font().height() : 0;
if (renderer()->isBox() && parent())
- return toRenderBox(m_renderer)->height();
+ return m_isVertical ? toRenderBox(m_renderer)->width() : toRenderBox(m_renderer)->height();
ASSERT(isInlineFlowBox());
RenderBoxModelObject* flowObject = boxModelObject();
const Font& font = renderer()->style(m_firstLine)->font();
int result = font.height();
if (parent())
- result += flowObject->borderAndPaddingHeight();
+ result += flowObject->borderAndPaddingLogicalHeight();
return result;
}