Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 831292 - don't mask complex-script ranges from the cmap if Graphite tables are present. r=jdaggett

Browse Source
This commit is contained in:
Jonathan Kew 2013-01-21 09:24:45 +00:00
parent 45b3edb7fe
commit de908b5bc2
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gfx/thebes/gfxMacPlatformFontList.mm
View File

@ -264,13 +264,25 @@ MacOSFontEntry::ReadCMAP()
}
if (NS_SUCCEEDED(rv)) {
#ifdef MOZ_GRAPHITE
// TODO: when we remove the MOZ_GRAPHITE conditional,
// we can merge this into the preceding if().
// Hence not (temporarily) indenting the code below
// by an extra level, only to undo that next time we
// touch it.
//
// We assume a Graphite font knows what it's doing,
// and provides whatever shaping is needed for the
// characters it supports, so only check/clear the
// complex-script ranges for non-Graphite fonts
if (!HasGraphiteTables()) {
#endif
// for layout support, check for the presence of mort/morx and/or
// opentype layout tables
bool hasAATLayout = HasFontTable(TRUETYPE_TAG('m','o','r','x')) ||
HasFontTable(TRUETYPE_TAG('m','o','r','t'));
bool hasGSUB = HasFontTable(TRUETYPE_TAG('G','S','U','B'));
bool hasGPOS = HasFontTable(TRUETYPE_TAG('G','P','O','S'));
if (hasAATLayout && !(hasGSUB || hasGPOS)) {
mRequiresAAT = true; // prefer CoreText if font has no OTL tables
}
@ -299,6 +311,9 @@ MacOSFontEntry::ReadCMAP()
charmap->ClearRange(sr.rangeStart, sr.rangeEnd);
}
}
#ifdef MOZ_GRAPHITE
}
#endif
}
mHasCmapTable = NS_SUCCEEDED(rv);