diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-09 17:17:40 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-09 17:17:40 +0200 |
| commit | 361748956bfcd31ca0edb5e2c845fb8c043945ba (patch) | |
| tree | 5224283a94e2632de4dccad21b30db26866983ff | |
| parent | 149b09027c3948bcea24a082615ac63e90d53ddb (diff) | |
| download | uxp-361748956bfcd31ca0edb5e2c845fb8c043945ba.tar.gz | |
Fix build bustage
Fix nsAtom->nsIAtom and FindAndAddFamilies()
| -rw-r--r-- | gfx/thebes/gfxPlatformFontList.cpp | 5 | ||||
| -rw-r--r-- | gfx/thebes/gfxPlatformFontList.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp index 06da75ee49..e12f4e1975 100644 --- a/gfx/thebes/gfxPlatformFontList.cpp +++ b/gfx/thebes/gfxPlatformFontList.cpp @@ -901,7 +901,7 @@ gfxPlatformFontList::ResolveEmojiFontNames( void gfxPlatformFontList::GetFontFamiliesFromGenericFamilies( nsTArray<nsString>& aGenericNameFamilies, - nsAtom* aLangGroup, + nsIAtom* aLangGroup, nsTArray<RefPtr<gfxFontFamily>>* aGenericFamilies) { // lookup and add platform fonts uniquely @@ -910,8 +910,7 @@ gfxPlatformFontList::GetFontFamiliesFromGenericFamilies( style.language = aLangGroup; style.systemFont = false; AutoTArray<gfxFontFamily*,10> families; - FindAndAddFamilies(genericFamily, &families, FindFamiliesFlags(0), - &style); + FindAndAddFamilies(genericFamily, &families, &style, 1.0); for (gfxFontFamily* f : families) { if (!aGenericFamilies->Contains(f)) { aGenericFamilies->AppendElement(f); diff --git a/gfx/thebes/gfxPlatformFontList.h b/gfx/thebes/gfxPlatformFontList.h index c3795a072a..d77c120593 100644 --- a/gfx/thebes/gfxPlatformFontList.h +++ b/gfx/thebes/gfxPlatformFontList.h @@ -386,7 +386,7 @@ protected: void GetFontFamiliesFromGenericFamilies( nsTArray<nsString>& aGenericFamilies, - nsAtom* aLangGroup, + nsIAtom* aLangGroup, nsTArray<RefPtr<gfxFontFamily>>* aFontFamilies); virtual nsresult InitFontListForPlatform() = 0; |