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

Bug 975460 - remove use of CGCopyFontTable in async font loader which didn't solve the crash problem on 10.6. r=smichaud,mkato

Browse Source
This commit is contained in:
John Daggett 2014-04-03 13:13:14 +09:00
parent 209fcc6aa8
commit c241192df9
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gfx/thebes/gfxMacPlatformFontList.mm
View File

@ -1072,29 +1072,6 @@ public:
virtual void LoadFontFamilyData(const nsAString& aFamilyName);
};
static CFDataRef
LoadFontTable(CTFontRef aFontRef, CTFontTableTag aTableTag)
{
CFDataRef fontTable = nullptr;
if (!aFontRef) {
return nullptr;
}
if (nsCocoaFeatures::OnLionOrLater()) {
fontTable = CTFontCopyTable(aFontRef, aTableTag,
kCTFontTableOptionNoOptions);
} else {
// bug 975460 - special case 10.6 to avoid CTFontCopyTable
CGFontRef cgFont = CTFontCopyGraphicsFont(aFontRef, nullptr);
if (cgFont) {
fontTable = CGFontCopyTableForTag(cgFont, aTableTag);
CFRelease(cgFont);
}
}
return fontTable;
}
void
MacFontInfo::LoadFontFamilyData(const nsAString& aFamilyName)
{
@ -1151,7 +1128,9 @@ MacFontInfo::LoadFontFamilyData(const nsAString& aFamilyName)
// load the cmap data
FontFaceData fontData;
CFDataRef cmapTable = LoadFontTable(fontRef, kCTFontTableCmap);
CFDataRef cmapTable = CTFontCopyTable(fontRef, kCTFontTableCmap,
kCTFontTableOptionNoOptions);
if (cmapTable) {
bool unicodeFont = false, symbolFont = false; // ignored
const uint8_t *cmapData =
@ -1177,7 +1156,9 @@ MacFontInfo::LoadFontFamilyData(const nsAString& aFamilyName)
}
if (mLoadOtherNames && hasOtherFamilyNames) {
CFDataRef nameTable = LoadFontTable(fontRef, kCTFontTableName);
CFDataRef nameTable = CTFontCopyTable(fontRef, kCTFontTableName,
kCTFontTableOptionNoOptions);
if (nameTable) {
const char *nameData = (const char*)CFDataGetBytePtr(nameTable);
uint32_t nameLen = CFDataGetLength(nameTable);