Modified: branches/subpixellayout/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp (109975 => 109976)
--- branches/subpixellayout/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp 2012-03-07 00:33:12 UTC (rev 109975)
+++ branches/subpixellayout/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp 2012-03-07 00:36:08 UTC (rev 109976)
@@ -163,7 +163,7 @@
if (!over->firstChild() || !over->firstChild()->isBoxModelObject())
break;
- int overSpacing = static_cast<int>(gOverSpacingAdjustment * (getOffsetHeight(over) - toRenderBoxModelObject(over->firstChild())->baselinePosition(AlphabeticBaseline, true, HorizontalLine)));
+ LayoutUnit overSpacing = static_cast<LayoutUnit>(gOverSpacingAdjustment * (getOffsetHeight(over) - toRenderBoxModelObject(over->firstChild())->baselinePosition(AlphabeticBaseline, true, HorizontalLine)));
// base row wrapper
base = over->nextSibling();
@@ -193,7 +193,7 @@
// FIXME: We need to look at the space between a single maximum height of
// the line boxes and the baseline and squeeze them together
- int underSpacing = baseHeight - toRenderBoxModelObject(base)->baselinePosition(AlphabeticBaseline, true, HorizontalLine);
+ LayoutUnit underSpacing = baseHeight - toRenderBoxModelObject(base)->baselinePosition(AlphabeticBaseline, true, HorizontalLine);
// adjust the base's intrusion into the under
RenderObject* under = lastChild();
@@ -214,7 +214,7 @@
// FIXME: bases that ascend higher than the line box intrude into the over
if (!over->firstChild() || !over->firstChild()->isBoxModelObject())
break;
- int overSpacing = static_cast<int>(gOverSpacingAdjustment * (getOffsetHeight(over) - toRenderBoxModelObject(over->firstChild())->baselinePosition(AlphabeticBaseline, true, HorizontalLine)));
+ LayoutUnit overSpacing = static_cast<LayoutUnit>(gOverSpacingAdjustment * (getOffsetHeight(over) - toRenderBoxModelObject(over->firstChild())->baselinePosition(AlphabeticBaseline, true, HorizontalLine)));
// base row wrapper
base = over->nextSibling();
@@ -234,7 +234,7 @@
// FIXME: We need to look at the space between a single maximum height of
// the line boxes and the baseline and squeeze them together
- int underSpacing = baseHeight - toRenderBoxModelObject(base)->baselinePosition(AlphabeticBaseline, true, HorizontalLine);
+ LayoutUnit underSpacing = baseHeight - toRenderBoxModelObject(base)->baselinePosition(AlphabeticBaseline, true, HorizontalLine);
RenderObject* under = lastChild();
if (under && under->firstChild() && under->firstChild()->isRenderInline() && underSpacing > 0)
