diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-09 19:41:33 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-09 19:41:33 +0200 |
| commit | fd2b227f19844978021811e9e1a60b8bcbd1ecad (patch) | |
| tree | a378867115a91a3f33ff019f2c303b0406b1c688 /gfx/thebes/gfxPlatformFontList.h | |
| parent | aa662adcfc086965ee9ecdcf4d2c01a1c4869efa (diff) | |
| parent | 2619698a2eb7363940d1e6a2d71a9ce7b366d3f5 (diff) | |
| download | UXP-fd2b227f19844978021811e9e1a60b8bcbd1ecad.tar UXP-fd2b227f19844978021811e9e1a60b8bcbd1ecad.tar.gz UXP-fd2b227f19844978021811e9e1a60b8bcbd1ecad.tar.lz UXP-fd2b227f19844978021811e9e1a60b8bcbd1ecad.tar.xz UXP-fd2b227f19844978021811e9e1a60b8bcbd1ecad.zip | |
Merge branch 'intl-ICU-emoji-work'
Diffstat (limited to 'gfx/thebes/gfxPlatformFontList.h')
| -rw-r--r-- | gfx/thebes/gfxPlatformFontList.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gfx/thebes/gfxPlatformFontList.h b/gfx/thebes/gfxPlatformFontList.h index c16994d8c..d77c12059 100644 --- a/gfx/thebes/gfxPlatformFontList.h +++ b/gfx/thebes/gfxPlatformFontList.h @@ -380,6 +380,15 @@ protected: eFontPrefLang aPrefLang, nsTArray<RefPtr<gfxFontFamily>>* aGenericFamilies); + void + ResolveEmojiFontNames(nsTArray<RefPtr<gfxFontFamily>>* aGenericFamilies); + + void + GetFontFamiliesFromGenericFamilies( + nsTArray<nsString>& aGenericFamilies, + nsIAtom* aLangGroup, + nsTArray<RefPtr<gfxFontFamily>>* aFontFamilies); + virtual nsresult InitFontListForPlatform() = 0; void ApplyWhitelist(); @@ -436,6 +445,8 @@ protected: eFontPrefLang_First, eFontPrefLang_Count> mLangGroupPrefFonts; + mozilla::UniquePtr<PrefFontList> mEmojiPrefFont; + // when system-wide font lookup fails for a character, cache it to skip future searches gfxSparseBitSet mCodepointsWithNoFonts; |