mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-24 05:44:10 +00:00
[not part of default build] Another go at fixing build bustage b:42793. It prevented the enabling of xprint with mathml. Paul B. Saitta <pbs@po.cwru.edu> verified that the changes compile and run, after accidently forgetting to turn xprint on the other time. a:waterson@mozilla.org
This commit is contained in:
parent
ece06c3d0d
commit
3b9a740778
@ -1436,7 +1436,7 @@ nsRenderingContextXP::GetBoundingMetrics(const char* aString,
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
XFontStruct *font_struct = mFont;
|
||||
XFontStruct *font_struct = mCurrentFont;
|
||||
XCharStruct overall;
|
||||
int direction, font_ascent, font_descent;
|
||||
|
||||
@ -1500,9 +1500,8 @@ FoundFont:
|
||||
// XXX avoid this test by duplicating code -- erik
|
||||
if (prevFont) {
|
||||
if (currFont != prevFont) {
|
||||
nsFontMetricsXP::GetBoundingMetrics(prevFont,
|
||||
(const PRUnichar*) &aString[start],
|
||||
i - start, rawbm);
|
||||
prevFont->GetBoundingMetrics((const PRUnichar*) &aString[start],
|
||||
i - start, rawbm);
|
||||
if (firstTime) {
|
||||
firstTime = PR_FALSE;
|
||||
aBoundingMetrics = rawbm;
|
||||
@ -1520,9 +1519,8 @@ FoundFont:
|
||||
}
|
||||
}
|
||||
if (prevFont) {
|
||||
nsFontMetricsXP::GetBoundingMetrics(prevFont,
|
||||
(const PRUnichar*) &aString[start],
|
||||
i - start, rawbm);
|
||||
prevFont->GetBoundingMetrics((const PRUnichar*) &aString[start],
|
||||
i - start, rawbm);
|
||||
if (firstTime) {
|
||||
aBoundingMetrics = rawbm;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user