tizen beta release

[framework/web/webkit-efl.git] / Source / WebCore / rendering / InlineBox.cpp

diff --git a/Source/WebCore/rendering/InlineBox.cpp b/Source/WebCore/rendering/InlineBox.cpp
index f26b234..0030e82 100755 (executable)
--- a/Source/WebCore/rendering/InlineBox.cpp
+++ b/Source/WebCore/rendering/InlineBox.cpp
@@ -141,7 +141,7 @@ void InlineBox::showBox(int printedCharacters) const
 }
 #endif
 
-LayoutUnit InlineBox::logicalHeight() const
+float InlineBox::logicalHeight() const
 {
     if (hasVirtualLogicalHeight())
         return virtualLogicalHeight();
@@ -154,7 +154,7 @@ LayoutUnit InlineBox::logicalHeight() const
     ASSERT(isInlineFlowBox());
     RenderBoxModelObject* flowObject = boxModelObject();
     const FontMetrics& fontMetrics = renderer()->style(m_firstLine)->fontMetrics();
-    LayoutUnit result = fontMetrics.height();
+    float result = fontMetrics.height();
     if (parent())
         result += flowObject->borderAndPaddingLogicalHeight();
     return result;