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

Backed out changeset 091a5ced91cd (bug 1031187)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-07-09 13:44:14 +02:00
parent e338c2088b
commit 1bf2972cd9
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/thebes/gfxFont.h
View File

@ -818,11 +818,7 @@ public:
{
aFontEntry->mIgnoreGDEF = true;
}
if (aFontEntry->mFamilyName.IsEmpty()) {
aFontEntry->mFamilyName = Name();
} else {
MOZ_ASSERT(aFontEntry->mFamilyName.Equals(Name()));
}
aFontEntry->mFamilyName = Name();
aFontEntry->mSkipDefaultFeatureSpaceCheck = mSkipDefaultFeatureSpaceCheck;
mAvailableFonts.AppendElement(aFontEntry);
}

3
gfx/thebes/gfxUserFontSet.cpp
View File

@ -355,7 +355,6 @@ gfxProxyFontEntry::LoadNext(gfxMixedFontFamily *aFamily,
uint32_t(mFontSet->mGeneration)));
fe->mFeatureSettings.AppendElements(mFeatureSettings);
fe->mLanguageOverride = mLanguageOverride;
fe->mFamilyName = mFamilyName;
// For src:local(), we don't care whether the request is from
// a private window as there's no issue of caching resources;
// local fonts are just available all the time.
@ -529,7 +528,6 @@ gfxProxyFontEntry::LoadFont(gfxMixedFontFamily *aFamily,
// newly-created font entry
fe->mFeatureSettings.AppendElements(mFeatureSettings);
fe->mLanguageOverride = mLanguageOverride;
fe->mFamilyName = mFamilyName;
StoreUserFontData(fe, mFontSet->GetPrivateBrowsing(), originalFullName,
&metadata, metaOrigLen);
#ifdef PR_LOGGING
@ -644,7 +642,6 @@ gfxUserFontSet::AddFontFace(const nsAString& aFamilyName,
aFeatureSettings,
aLanguageOverride,
aUnicodeRanges);
proxyEntry->mFamilyName = aFamilyName;
family->AddFontEntry(proxyEntry);
#ifdef PR_LOGGING
if (LOG_ENABLED()) {

12
gfx/thebes/gfxUserFontSet.h
View File

@ -103,11 +103,7 @@ public:
break;
}
}
if (aFontEntry->mFamilyName.IsEmpty()) {
aFontEntry->mFamilyName = Name();
} else {
MOZ_ASSERT(aFontEntry->mFamilyName.Equals(Name()));
}
aFontEntry->mFamilyName = Name();
ResetCharacterMap();
}
@ -122,11 +118,7 @@ public:
// Note that this may delete aProxyFontEntry, if there's no
// other reference to it except from its family.
mAvailableFonts[i] = aRealFontEntry;
if (aRealFontEntry->mFamilyName.IsEmpty()) {
aRealFontEntry->mFamilyName = Name();
} else {
MOZ_ASSERT(aRealFontEntry->mFamilyName.Equals(Name()));
}
aRealFontEntry->mFamilyName = Name();
break;
}
}