Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-16 06:54:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 130443 . r=nhotta sr=sfraser a=asa

Browse Source 
cast the hash value to FMFontFamily instead of fondid (short) on carbon and get the correct script code from it by using the right api
This commit is contained in:
ftang%netscape.com 2006-02-10 22:49:25 +00:00
parent 370d6cc937
commit ddee4cff5a
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
widget/src/mac/nsDeviceContextMac.cpp
View File

@ -1147,10 +1147,23 @@ EnumerateFont(nsHashKey *aKey, void *aData, void* closure)
EnumerateFontInfo* info = (EnumerateFontInfo*) closure;
PRUnichar** array = info->mArray;
int j = info->mCount;
PRBool match = PR_FALSE;
#if TARGET_CARBON
// we need to match the cast of FMFontFamily in nsDeviceContextMac :: InitFontInfoList()
FMFontFamily fontFamily = (FMFontFamily) aData;
TextEncoding fontEncoding;
OSStatus status = ::FMGetFontFamilyTextEncoding(fontFamily, &fontEncoding);
if (noErr == status) {
ScriptCode script;
status = ::RevertTextEncodingToScriptInfo(fontEncoding, &script, nsnull, nsnull);
match = ((noErr == status) && (script == info->mScript));
}
#else
short fondID = (short) aData;
ScriptCode script = ::FontToScript(fondID);
if(script == info->mScript) {
match = (script == info->mScript) ;
#endif
if (match) {
PRUnichar* str = ToNewUnicode(((FontNameKey*)aKey)->mString);
if (!str) {
for (j = j - 1; j >= 0; j--) {