wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 2257088c6b04 (bug 1188802)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-02-05 11:19:11 +01:00
parent 95180267e2
commit 2a00c628b2
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/thebes/gfxUserFontSet.cpp
View File

@ -784,7 +784,6 @@ gfxUserFontEntry::GetUserFontSets(nsTArray<gfxUserFontSet*>& aResult)
gfxUserFontSet::gfxUserFontSet() gfxUserFontSet::gfxUserFontSet()
: mFontFamilies(4), : mFontFamilies(4),
mLocalRulesUsed(false), mLocalRulesUsed(false),
mRebuildLocalRules(false),
mDownloadCount(0), mDownloadCount(0),
mDownloadSize(0) mDownloadSize(0)
{ {
@ -959,7 +958,6 @@ void
gfxUserFontSet::RebuildLocalRules() gfxUserFontSet::RebuildLocalRules()
{ {
if (mLocalRulesUsed) { if (mLocalRulesUsed) {
mRebuildLocalRules = true;
DoRebuildUserFontSet(); DoRebuildUserFontSet();
} }
} }

3
gfx/thebes/gfxUserFontSet.h
View File

@ -526,9 +526,6 @@ protected:
// true when local names have been looked up, false otherwise // true when local names have been looked up, false otherwise
bool mLocalRulesUsed; bool mLocalRulesUsed;
// true when rules using local names need to be redone
bool mRebuildLocalRules;
// performance stats // performance stats
uint32_t mDownloadCount; uint32_t mDownloadCount;
uint64_t mDownloadSize; uint64_t mDownloadSize;

10
layout/style/FontFaceSet.cpp
View File

@ -789,11 +789,8 @@ FontFaceSet::UpdateRules(const nsTArray<nsFontFaceRuleContainer>& aRules)
CheckLoadingFinished(); CheckLoadingFinished();
} }
// if local rules needed to be rebuilt, they have been rebuilt at this point // local rules have been rebuilt, so clear the flag
if (mUserFontSet->mRebuildLocalRules) { mUserFontSet->mLocalRulesUsed = false;
mUserFontSet->mLocalRulesUsed = false;
mUserFontSet->mRebuildLocalRules = false;
}
if (LOG_ENABLED() && !mRuleFaces.IsEmpty()) { if (LOG_ENABLED() && !mRuleFaces.IsEmpty()) {
LOG(("userfonts (%p) userfont rules update (%s) rule count: %d", LOG(("userfonts (%p) userfont rules update (%s) rule count: %d",
@ -878,8 +875,7 @@ FontFaceSet::InsertRuleFontFace(FontFace* aFontFace, SheetType aSheetType,
// if local rules were used, don't use the old font entry // if local rules were used, don't use the old font entry
// for rules containing src local usage // for rules containing src local usage
if (mUserFontSet->mLocalRulesUsed && if (mUserFontSet->mLocalRulesUsed) {
mUserFontSet->mRebuildLocalRules) {
nsCSSValue val; nsCSSValue val;
aFontFace->GetDesc(eCSSFontDesc_Src, val); aFontFace->GetDesc(eCSSFontDesc_Src, val);
nsCSSUnit unit = val.GetUnit(); nsCSSUnit unit = val.GetUnit();