fix uninitialized variable causing incorrect fallback font selection (bug 451426) r=roc sr=roc

This commit is contained in:
Jonathan Kew 2008-11-26 10:13:02 -08:00
Родитель 098c837567
Коммит 8e1a66e1d5
1 изменённых файлов: 1 добавлений и 5 удалений

Просмотреть файл

@ -1017,7 +1017,7 @@ gfxFontGroup::ForEachFontInternal(const nsAString& aFamilies,
NS_LossyConvertUTF16toASCII gf(genericFamily);
if (aResolveFontName) {
ResolveData data(fc, gf, closure);
PRBool aborted, needsBold;
PRBool aborted = PR_FALSE, needsBold;
nsresult rv;
if (mUserFontSet && mUserFontSet->FindFontEntry(family, mStyle, needsBold)) {
@ -1121,10 +1121,6 @@ gfxFontGroup::FindFontForChar(PRUint32 aCh, PRUint32 aPrevCh, PRUint32 aNextCh,
return font.forget();
}
// if match, return
if (selectedFont)
return selectedFont.forget();
// if character is in Private Use Area, don't do matching against pref or system fonts
if ((aCh >= 0xE000 && aCh <= 0xF8FF) || (aCh >= 0xF0000 && aCh <= 0x10FFFD))
return nsnull;