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

Bug 1351200 - Part 3: stylo: Bypass cache when fetching font size prefs from Stylo; r=emilio

Browse Source 
MozReview-Commit-ID: 7WBduQ6lBTC
This commit is contained in:
Manish Goregaokar 2017-04-04 11:11:27 -07:00
parent 461607d8a6
commit 42199474b9
7 changed files with 99 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
intl/locale/nsILanguageAtomService.h
View File

@ -35,8 +35,13 @@ class nsILanguageAtomService : public nsISupports
virtual nsIAtom* GetLocaleLanguage() = 0;
virtual nsIAtom* GetLanguageGroup(nsIAtom *aLanguage,
nsresult *aError = nullptr) = 0;
virtual nsIAtom* GetLanguageGroup(nsIAtom* aLanguage,
nsresult* aError = nullptr) = 0;
// Same as GetLanguageGroup, but will not cache anything
// and can be used from a different thread
virtual already_AddRefed<nsIAtom> GetUncachedLanguageGroup(nsIAtom* aLanguage,
nsresult* aError = nullptr) const = 0;
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsILanguageAtomService,

60
intl/locale/nsLanguageAtomService.cpp
View File

@ -62,44 +62,54 @@ nsLanguageAtomService::GetLocaleLanguage()
}
nsIAtom*
nsLanguageAtomService::GetLanguageGroup(nsIAtom *aLanguage,
nsresult *aError)
nsLanguageAtomService::GetLanguageGroup(nsIAtom* aLanguage,
nsresult* aError)
{
nsIAtom *retVal;
nsresult res = NS_OK;
nsIAtom* retVal;
retVal = mLangToGroup.GetWeak(aLanguage);
if (!retVal) {
nsAutoCString langStr;
aLanguage->ToUTF8String(langStr);
nsCOMPtr<nsIAtom> uncached = GetUncachedLanguageGroup(aLanguage, aError);
retVal = uncached.get();
nsAutoCString langGroupStr;
// The hashtable will keep an owning reference to the atom
mLangToGroup.Put(aLanguage, uncached);
}
return retVal;
}
already_AddRefed<nsIAtom>
nsLanguageAtomService::GetUncachedLanguageGroup(nsIAtom* aLanguage,
nsresult* aError) const
{
nsresult res = NS_OK;
nsAutoCString langStr;
aLanguage->ToUTF8String(langStr);
nsAutoCString langGroupStr;
res = nsUConvPropertySearch::SearchPropertyValue(kLangGroups,
ArrayLength(kLangGroups),
langStr, langGroupStr);
while (NS_FAILED(res)) {
int32_t hyphen = langStr.RFindChar('-');
if (hyphen <= 0) {
langGroupStr.AssignLiteral("x-unicode");
break;
}
langStr.Truncate(hyphen);
res = nsUConvPropertySearch::SearchPropertyValue(kLangGroups,
ArrayLength(kLangGroups),
langStr, langGroupStr);
while (NS_FAILED(res)) {
int32_t hyphen = langStr.RFindChar('-');
if (hyphen <= 0) {
langGroupStr.AssignLiteral("x-unicode");
break;
}
langStr.Truncate(hyphen);
res = nsUConvPropertySearch::SearchPropertyValue(kLangGroups,
ArrayLength(kLangGroups),
langStr, langGroupStr);
}
nsCOMPtr<nsIAtom> langGroup = NS_Atomize(langGroupStr);
// The hashtable will keep an owning reference to the atom
mLangToGroup.Put(aLanguage, langGroup);
retVal = langGroup.get();
}
nsCOMPtr<nsIAtom> langGroup = NS_Atomize(langGroupStr);
if (aError) {
*aError = res;
}
return retVal;
return langGroup.forget();
}

6
intl/locale/nsLanguageAtomService.h
View File

@ -28,8 +28,10 @@ public:
virtual nsIAtom* GetLocaleLanguage() override;
virtual nsIAtom* GetLanguageGroup(nsIAtom *aLanguage,
nsresult *aError) override;
virtual nsIAtom* GetLanguageGroup(nsIAtom* aLanguage,
nsresult* aError) override;
virtual already_AddRefed<nsIAtom> GetUncachedLanguageGroup(nsIAtom* aLanguage,
nsresult* aError) const final;
nsLanguageAtomService();

11
layout/base/StaticPresData.cpp
View File

@ -247,6 +247,17 @@ StaticPresData::GetLangGroup(nsIAtom* aLanguage) const
return langGroupAtom;
}
already_AddRefed<nsIAtom>
StaticPresData::GetUncachedLangGroup(nsIAtom* aLanguage) const
{
nsresult rv = NS_OK;
nsCOMPtr<nsIAtom> langGroupAtom = mLangService->GetUncachedLanguageGroup(aLanguage, &rv);
if (NS_FAILED(rv) || !langGroupAtom) {
langGroupAtom = nsGkAtoms::x_western; // Assume x-western is safe...
}
return langGroupAtom.forget();
}
const LangGroupFontPrefs*
StaticPresData::GetFontPrefsForLangHelper(nsIAtom* aLanguage,
const LangGroupFontPrefs* aPrefs) const

6
layout/base/StaticPresData.h
View File

@ -100,6 +100,12 @@ public:
*/
nsIAtom* GetLangGroup(nsIAtom* aLanguage) const;
/**
* Same as GetLangGroup, but will not cache the result
*
*/
already_AddRefed<nsIAtom> GetUncachedLangGroup(nsIAtom* aLanguage) const;
/**
* Fetch the user's font preferences for the given aLanguage's
* langugage group.

25
layout/style/ServoBindings.cpp
View File

@ -1584,10 +1584,29 @@ Gecko_nsStyleFont_CopyLangFrom(nsStyleFont* aFont, const nsStyleFont* aSource)
aFont->mLanguage = aSource->mLanguage;
}
nscoord
Gecko_nsStyleFont_GetBaseSize(const nsStyleFont* aFont, RawGeckoPresContextBorrowed aPresContext)
void
FontSizePrefs::CopyFrom(const LangGroupFontPrefs& prefs)
{
return aPresContext->GetDefaultFont(aFont->mGenericID, aFont->mLanguage)->size;
mDefaultVariableSize = prefs.mDefaultVariableFont.size;
mDefaultFixedSize = prefs.mDefaultFixedFont.size;
mDefaultSerifSize = prefs.mDefaultSerifFont.size;
mDefaultSansSerifSize = prefs.mDefaultSansSerifFont.size;
mDefaultMonospaceSize = prefs.mDefaultMonospaceFont.size;
mDefaultCursiveSize = prefs.mDefaultCursiveFont.size;
mDefaultFantasySize = prefs.mDefaultFantasyFont.size;
}
FontSizePrefs
Gecko_GetBaseSize(nsIAtom* aLanguage)
{
LangGroupFontPrefs prefs;
nsCOMPtr<nsIAtom> langGroupAtom = StaticPresData::Get()->GetUncachedLangGroup(aLanguage);
prefs.Initialize(langGroupAtom);
FontSizePrefs sizes;
sizes.CopyFrom(prefs);
return sizes;
}
void

15
layout/style/ServoBindings.h
View File

@ -40,6 +40,7 @@ namespace mozilla {
struct URLValue;
};
enum class UpdateAnimationsTasks : uint8_t;
struct LangGroupFontPrefs;
}
using mozilla::FontFamilyList;
using mozilla::FontFamilyType;
@ -94,6 +95,18 @@ public:
mozilla::URLExtraData* mExtraData;
};
struct FontSizePrefs
{
void CopyFrom(const mozilla::LangGroupFontPrefs&);
nscoord mDefaultVariableSize;
nscoord mDefaultFixedSize;
nscoord mDefaultSerifSize;
nscoord mDefaultSansSerifSize;
nscoord mDefaultMonospaceSize;
nscoord mDefaultCursiveSize;
nscoord mDefaultFantasySize;
};
// DOM Traversal.
uint32_t Gecko_ChildrenCount(RawGeckoNodeBorrowed node);
bool Gecko_NodeIsElement(RawGeckoNodeBorrowed node);
@ -384,7 +397,7 @@ bool Gecko_PropertyId_IsPrefEnabled(nsCSSPropertyID id);
void Gecko_nsStyleFont_SetLang(nsStyleFont* font, nsIAtom* atom);
void Gecko_nsStyleFont_CopyLangFrom(nsStyleFont* aFont, const nsStyleFont* aSource);
nscoord Gecko_nsStyleFont_GetBaseSize(const nsStyleFont* font, RawGeckoPresContextBorrowed pres_context);
FontSizePrefs Gecko_GetBaseSize(nsIAtom* lang);
const nsMediaFeature* Gecko_GetMediaFeatures();