mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-24 21:58:06 +00:00
Bug 102461: Workaround for bug 93771 causes hang in Xprint module, patch by gisburn, r=jag, sr=jst
This commit is contained in:
parent
836a737b32
commit
d3941a351c
@ -1068,13 +1068,19 @@ nsFontMetricsXlib::Init(const nsFont& aFont, nsIAtom* aLangGroup,
|
||||
|
||||
#ifdef USE_XPRINT
|
||||
#ifdef XPRINT_FONT_HACK
|
||||
nsString *savedName;
|
||||
nsString savedName;
|
||||
|
||||
/* We're limiting here the font search to "serif" only now
|
||||
* until we have a fix for bug 93771 ("Mozilla uses
|
||||
* low-resolution bitmap fonts on high resolution X11 displays")
|
||||
*/
|
||||
if(mPrinterMode)
|
||||
{
|
||||
savedName = &mFont->name;
|
||||
/* save original font name (that we can restore it later, see below)... */
|
||||
savedName = mFont->name;
|
||||
/* .. and replace it with "serif" for now. */
|
||||
mFont->name = NS_LITERAL_STRING("serif");
|
||||
}
|
||||
}
|
||||
#endif /* XPRINT_FONT_HACK */
|
||||
#endif /* USE_XPRINT */
|
||||
|
||||
@ -1180,8 +1186,9 @@ nsFontMetricsXlib::Init(const nsFont& aFont, nsIAtom* aLangGroup,
|
||||
|
||||
#ifdef USE_XPRINT
|
||||
#ifdef XPRINT_FONT_HACK
|
||||
/* restore the original font name */
|
||||
if(mPrinterMode)
|
||||
mFont->name = *savedName;
|
||||
mFont->name = savedName;
|
||||
#endif /* XPRINT_FONT_HACK */
|
||||
#endif /* USE_XPRINT */
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user