Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 219060 : make freetype printing work for Xft build (r=louie.zhao, sr=bryner)

Browse Source
This commit is contained in:
jshin%mailaps.org 2003-09-28 05:59:39 +00:00
parent 8ae7b198b9
commit 4c86556777
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gfx/src/ps/nsFontMetricsPS.cpp
View File

@ -716,9 +716,16 @@ nsFontPSFreeType::CSSFontEnumCallback(const nsString& aFamily, PRBool aGeneric,
if (!value.get())
return PR_TRUE; // keep trying
// strip down to just the family name
PRUint32 startFamily = value.FindChar('-') + 1;
PRUint32 endFamily = value.FindChar('-', startFamily);
familyname.Append(Substring(value, startFamily, endFamily - startFamily));
PRInt32 startFamily = value.FindChar('-') + 1;
if (startFamily < 0) // 1st '-' not found. Not FFRE but just familyName.
familyname = value;
else {
PRInt32 endFamily = value.FindChar('-', startFamily);
if (endFamily < 0) // 2nd '-' not found
familyname.Append(Substring(value, startFamily));
else // FFRE
familyname.Append(Substring(value, startFamily, endFamily - startFamily));
}
FIND_FONTPS_PRINTF(("generic font \"%s\" -> \"%s\"", name.get(),
familyname.get()));
}
@ -758,9 +765,16 @@ nsFontPSFreeType::AddUserPref(nsIAtom *aLang, const nsFont& aFont,
return PR_FALSE;
// strip down to just the family name
PRUint32 startFamily = value.FindChar('-') + 1;
PRUint32 endFamily = value.FindChar('-', startFamily);
fontName.Append(Substring(value, startFamily, endFamily - startFamily));
PRInt32 startFamily = value.FindChar('-') + 1;
if (startFamily < 0) // '-' not found. Not FFRE but just familyName
fontName = value;
else {
PRInt32 endFamily = value.FindChar('-', startFamily);
if (endFamily < 0) // 2nd '-' not found
fontName.Append(Substring(value, startFamily));
else // FFRE
fontName.Append(Substring(value, startFamily, endFamily - startFamily));
}
AddFontEntries(fontName, fpi->lang, fpi->weight,
nsIFontCatalogService::kFCWidthAny, fpi->slant,