Bug 362048 gfxPlatFormGtk::ResolveFontName returns uninitialzed value for aAborted r=dbaron

This commit is contained in:
masayuki%d-toybox.com 2006-12-07 07:01:08 +00:00
Родитель b70b677b21
Коммит 0b8a8c3b21
2 изменённых файлов: 8 добавлений и 4 удалений

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

@ -325,6 +325,8 @@ gfxBeOSPlatform::ResolveFontName(const nsAString& aFontName,
void *aClosure,
PRBool& aAborted)
{
aAborted = PR_FALSE;
nsresult rv = UpdateFontListInternal();
if (NS_FAILED(rv))
return rv;
@ -360,9 +362,9 @@ gfxBeOSPlatform::IsExistingFont(const nsACString &aFontName)
// We should check negative cache at first.
if (mNonExistingFonts.IndexOf(aFontName) >= 0)
return 0;
else if (mAliasForSingleFont.IndexOf(aFontName) >= 0)
if (mAliasForSingleFont.IndexOf(aFontName) >= 0)
return 1;
else if (mFonts.IndexOf(aFontName) >= 0)
if (mFonts.IndexOf(aFontName) >= 0)
return 1;
// XXX Sometimes, the font has two or more names (e.g., "Sazanami Gothic"

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

@ -485,6 +485,8 @@ gfxPlatformGtk::ResolveFontName(const nsAString& aFontName,
void *aClosure,
PRBool& aAborted)
{
aAborted = PR_FALSE;
nsresult rv = UpdateFontListInternal();
if (NS_FAILED(rv))
return rv;
@ -520,9 +522,9 @@ gfxPlatformGtk::IsExistingFont(const nsACString &aFontName)
// We should check negative cache at first.
if (mNonExistingFonts.IndexOf(aFontName) >= 0)
return 0;
else if (mAliasForSingleFont.IndexOf(aFontName) >= 0)
if (mAliasForSingleFont.IndexOf(aFontName) >= 0)
return 1;
else if (mFonts.IndexOf(aFontName) >= 0)
if (mFonts.IndexOf(aFontName) >= 0)
return 1;
// XXX Sometimes, the font has two or more names (e.g., "Sazanami Gothic"