mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 22:05:44 +00:00
merge backout
This commit is contained in:
commit
61a50934c9
@ -436,7 +436,6 @@ nsMathMLmunderoverFrame::Place(nsRenderingContext& aRenderingContext,
|
||||
nscoord ascentAnonymousBase =
|
||||
NS_MAX(mBoundingMetrics.ascent + overDelta2,
|
||||
overSize.ascent + bmOver.descent + overDelta1 + bmBase.ascent);
|
||||
ascentAnonymousBase = NS_MAX(ascentAnonymousBase, baseSize.ascent);
|
||||
|
||||
GetItalicCorrection(bmAnonymousBase, correction);
|
||||
|
||||
@ -476,9 +475,6 @@ nsMathMLmunderoverFrame::Place(nsRenderingContext& aRenderingContext,
|
||||
NS_MAX(mBoundingMetrics.descent + underDelta2,
|
||||
bmAnonymousBase.descent + underDelta1 + bmUnder.ascent +
|
||||
underSize.height - underSize.ascent);
|
||||
aDesiredSize.height = NS_MAX(aDesiredSize.height,
|
||||
aDesiredSize.ascent +
|
||||
baseSize.height - baseSize.ascent);
|
||||
aDesiredSize.width = mBoundingMetrics.width;
|
||||
aDesiredSize.mBoundingMetrics = mBoundingMetrics;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user