wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-04 22:37:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix build bustage

Browse source 
Fix nsAtom->nsIAtom and FindAndAddFamilies()
This commit is contained in:
wolfbeast 2018-05-09 17:17:40 +02:00 • committed by Roy Tam
commit 826e420144
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gfx/thebes/gfxPlatformFontList.cpp
View file

@ -901,7 +901,7 @@ gfxPlatformFontList::ResolveEmojiFontNames(
void void
gfxPlatformFontList::GetFontFamiliesFromGenericFamilies( gfxPlatformFontList::GetFontFamiliesFromGenericFamilies(
nsTArray<nsString>& aGenericNameFamilies, nsTArray<nsString>& aGenericNameFamilies,
nsAtom* aLangGroup, nsIAtom* aLangGroup,
nsTArray<RefPtr<gfxFontFamily>>* aGenericFamilies) nsTArray<RefPtr<gfxFontFamily>>* aGenericFamilies)
{ {
// lookup and add platform fonts uniquely // lookup and add platform fonts uniquely
@ -910,8 +910,7 @@ gfxPlatformFontList::GetFontFamiliesFromGenericFamilies(
style.language = aLangGroup; style.language = aLangGroup;
style.systemFont = false; style.systemFont = false;
AutoTArray<gfxFontFamily*,10> families; AutoTArray<gfxFontFamily*,10> families;
FindAndAddFamilies(genericFamily, &families, FindFamiliesFlags(0), FindAndAddFamilies(genericFamily, &families, &style, 1.0);
&style);
for (gfxFontFamily* f : families) { for (gfxFontFamily* f : families) {
if (!aGenericFamilies->Contains(f)) { if (!aGenericFamilies->Contains(f)) {
aGenericFamilies->AppendElement(f); aGenericFamilies->AppendElement(f);

2
gfx/thebes/gfxPlatformFontList.h
View file

@ -386,7 +386,7 @@ protected:
void void
GetFontFamiliesFromGenericFamilies( GetFontFamiliesFromGenericFamilies(
nsTArray<nsString>& aGenericFamilies, nsTArray<nsString>& aGenericFamilies,
nsAtom* aLangGroup, nsIAtom* aLangGroup,
nsTArray<RefPtr<gfxFontFamily>>* aFontFamilies); nsTArray<RefPtr<gfxFontFamily>>* aFontFamilies);
virtual nsresult InitFontListForPlatform() = 0; virtual nsresult InitFontListForPlatform() = 0;