b=669932 munderover: consider underscript vertical metrics during the underscript attachment phase instead of the overscript attachment phase. r=karlt

--HG--
extra : transplant_source : %B6%29%E1%1B%D4%0D%84fV%B9%1F%16%15%3Cu%A4%22%A0%94%F1
This commit is contained in:
Frédéric Wang 2011-08-05 12:57:27 +12:00
parent 9150c1ec49
commit 04012253b4

View File

@ -419,8 +419,7 @@ nsMathMLmunderoverFrame::Place(nsRenderingContext& aRenderingContext,
mBoundingMetrics.ascent =
bmBase.ascent + overDelta1 + bmOver.ascent + bmOver.descent;
mBoundingMetrics.descent =
bmBase.descent + underDelta1 + bmUnder.ascent + bmUnder.descent;
mBoundingMetrics.descent = bmBase.descent;
mBoundingMetrics.leftBearing =
NS_MIN(dxBase + bmBase.leftBearing, dxOver + bmOver.leftBearing);
mBoundingMetrics.rightBearing =
@ -463,6 +462,9 @@ nsMathMLmunderoverFrame::Place(nsRenderingContext& aRenderingContext,
mBoundingMetrics.width =
NS_MAX(dxAnonymousBase + bmAnonymousBase.width, dxUnder + bmUnder.width);
// At this point, mBoundingMetrics.ascent = bmAnonymousBase.ascent
mBoundingMetrics.descent =
bmAnonymousBase.descent + underDelta1 + bmUnder.ascent + bmUnder.descent;
mBoundingMetrics.leftBearing =
NS_MIN(dxAnonymousBase + bmAnonymousBase.leftBearing, dxUnder + bmUnder.leftBearing);
mBoundingMetrics.rightBearing =