diff options
Diffstat (limited to 'WebCore/mathml/RenderMathMLUnderOver.cpp')
| -rw-r--r-- | WebCore/mathml/RenderMathMLUnderOver.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/WebCore/mathml/RenderMathMLUnderOver.cpp b/WebCore/mathml/RenderMathMLUnderOver.cpp index a76f6b1..a3de697 100644 --- a/WebCore/mathml/RenderMathMLUnderOver.cpp +++ b/WebCore/mathml/RenderMathMLUnderOver.cpp @@ -158,7 +158,7 @@ void RenderMathMLUnderOver::layout() if (!over->firstChild()->isBoxModelObject()) break; - int overSpacing = static_cast<int>(gOverSpacingAdjustment * (getOffsetHeight(over) - toRenderBoxModelObject(over->firstChild())->baselinePosition(true, HorizontalLine))); + int overSpacing = static_cast<int>(gOverSpacingAdjustment * (getOffsetHeight(over) - toRenderBoxModelObject(over->firstChild())->baselinePosition(AlphabeticBaseline, true, HorizontalLine))); // base row wrapper base = over->nextSibling(); @@ -188,7 +188,7 @@ void RenderMathMLUnderOver::layout() // 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(true, HorizontalLine); + int underSpacing = baseHeight - toRenderBoxModelObject(base)->baselinePosition(AlphabeticBaseline, true, HorizontalLine); // adjust the base's intrusion into the under RenderObject* under = lastChild(); @@ -209,7 +209,7 @@ void RenderMathMLUnderOver::layout() // FIXME: bases that ascend higher than the line box intrude into the over if (!over->firstChild()->isBoxModelObject()) break; - int overSpacing = static_cast<int>(gOverSpacingAdjustment * (getOffsetHeight(over) - toRenderBoxModelObject(over->firstChild())->baselinePosition(true, HorizontalLine))); + int overSpacing = static_cast<int>(gOverSpacingAdjustment * (getOffsetHeight(over) - toRenderBoxModelObject(over->firstChild())->baselinePosition(AlphabeticBaseline, true, HorizontalLine))); // base row wrapper base = over->nextSibling(); @@ -229,7 +229,7 @@ void RenderMathMLUnderOver::layout() // 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(true, HorizontalLine); + int underSpacing = baseHeight - toRenderBoxModelObject(base)->baselinePosition(AlphabeticBaseline, true, HorizontalLine); RenderObject* under = lastChild(); if (under && under->firstChild()->isRenderInline() && underSpacing > 0) @@ -243,11 +243,11 @@ void RenderMathMLUnderOver::layout() RenderBlock::layout(); } -int RenderMathMLUnderOver::baselinePosition(bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const +int RenderMathMLUnderOver::baselinePosition(FontBaseline, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const { RenderObject* current = firstChild(); if (!current) - return RenderBlock::baselinePosition(firstLine, direction, linePositionMode); + return RenderBlock::baselinePosition(AlphabeticBaseline, firstLine, direction, linePositionMode); int baseline = 0; switch (m_kind) { @@ -260,7 +260,7 @@ int RenderMathMLUnderOver::baselinePosition(bool firstLine, LineDirectionMode di RenderObject* base = current->firstChild(); if (!base || !base->isBoxModelObject()) break; - baseline += toRenderBoxModelObject(base)->baselinePosition(firstLine, HorizontalLine, linePositionMode); + baseline += toRenderBoxModelObject(base)->baselinePosition(AlphabeticBaseline, firstLine, HorizontalLine, linePositionMode); // added the negative top margin baseline += current->style()->marginTop().value(); } @@ -268,7 +268,7 @@ int RenderMathMLUnderOver::baselinePosition(bool firstLine, LineDirectionMode di case Under: RenderObject* base = current->firstChild(); if (base && base->isBoxModelObject()) - baseline += toRenderBoxModelObject(base)->baselinePosition(true, HorizontalLine); + baseline += toRenderBoxModelObject(base)->baselinePosition(AlphabeticBaseline, true, HorizontalLine); } // FIXME: Where is the extra 2-3px adjusted for zoom coming from? |