Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 758257 - work around broken fonts on android when using cached font list as well as when first reading the list. r=jdaggett

Browse Source
This commit is contained in:
Jonathan Kew 2012-05-25 15:03:42 +01:00
parent 552f1b1d87
commit 49eae009af
2 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
gfx/thebes/gfxFT2FontList.cpp
View File

@ -721,6 +721,35 @@ AppendToFaceList(nsCString& aFaceList,
aFaceList.Append(',');
}
void
FT2FontEntry::CheckForBrokenFont()
{
NS_ASSERTION(mFamily != nsnull, "font entry must belong to a family");
// note if the family is in the "bad underline" blacklist
if (mFamily->IsBadUnderlineFamily()) {
mIsBadUnderlineFont = true;
}
// bug 721719 - set the IgnoreGSUB flag on entries for Roboto
// because of unwanted on-by-default "ae" ligature.
// (See also AppendFaceFromFontListEntry.)
if (mFamily->Name().EqualsLiteral("roboto")) {
mIgnoreGSUB = true;
}
// bug 706888 - set the IgnoreGSUB flag on the broken version of
// Droid Sans Arabic from certain phones, as identified by the
// font checksum in the 'head' table
else if (mFamily->Name().EqualsLiteral("droid sans arabic")) {
const TT_Header *head = static_cast<const TT_Header*>
(FT_Get_Sfnt_Table(mFTFace, ft_sfnt_head));
if (head && head->CheckSum_Adjust == 0xe445242) {
mIgnoreGSUB = true;
}
}
}
void
gfxFT2FontList::AppendFacesFromFontFile(nsCString& aFileName,
bool aStdFile,
@ -777,27 +806,9 @@ gfxFT2FontList::AppendFacesFromFontFile(nsCString& aFileName,
}
fe->mStandardFace = aStdFile;
family->AddFontEntry(fe);
if (family->IsBadUnderlineFamily()) {
fe->mIsBadUnderlineFont = true;
}
// bug 721719 - set the IgnoreGSUB flag on entries for Roboto
// because of unwanted on-by-default "ae" ligature.
// (See also AppendFaceFromFontListEntry.)
if (name.EqualsLiteral("roboto")) {
fe->mIgnoreGSUB = true;
}
// bug 706888 - set the IgnoreGSUB flag on the broken version of
// Droid Sans Arabic from certain phones, as identified by the
// font checksum in the 'head' table
else if (name.EqualsLiteral("droid sans arabic")) {
const TT_Header *head = static_cast<const TT_Header*>
(FT_Get_Sfnt_Table(face, ft_sfnt_head));
if (head && head->CheckSum_Adjust == 0xe445242) {
fe->mIgnoreGSUB = true;
}
}
// this depends on the entry having been added to its family
fe->CheckForBrokenFont();
AppendToFaceList(faceList, name, fe);
#ifdef PR_LOGGING
@ -1005,20 +1016,9 @@ gfxFT2FontList::AppendFaceFromFontListEntry(const FontListEntry& aFLE,
}
}
family->AddFontEntry(fe);
if (family->IsBadUnderlineFamily()) {
fe->mIsBadUnderlineFont = true;
}
// bug 721719 - set the IgnoreGSUB flag on entries for Roboto
// because of unwanted on-by-default "ae" ligature.
// This totally sucks, but if we don't hack around these broken fonts
// we get really bad text rendering, which we can't inflict on users. :(
// If we accumulate a few more examples of this stuff, it'll be time
// to create some prefs for the list of fonts where we need to ignore
// layout tables. Sigh.
if (name.EqualsLiteral("roboto")) {
fe->mIgnoreGSUB = true;
}
// this depends on the entry having been added to its family
fe->CheckForBrokenFont();
}
}

4
gfx/thebes/gfxFT2FontList.h
View File

@ -68,6 +68,10 @@ public:
nsresult ReadCMAP();
nsresult GetFontTable(PRUint32 aTableTag, FallibleTArray<PRUint8>& aBuffer);
// Check for various kinds of brokenness, and set flags on the entry
// accordingly so that we avoid using bad font tables
void CheckForBrokenFont();
virtual void SizeOfExcludingThis(nsMallocSizeOfFun aMallocSizeOf,
FontListSizes* aSizes) const;
virtual void SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf,