From 361748956bfcd31ca0edb5e2c845fb8c043945ba Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 9 May 2018 17:17:40 +0200 Subject: Fix build bustage Fix nsAtom->nsIAtom and FindAndAddFamilies() --- gfx/thebes/gfxPlatformFontList.cpp | 5 ++--- gfx/thebes/gfxPlatformFontList.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'gfx/thebes') diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp index 06da75ee4..e12f4e197 100644 --- a/gfx/thebes/gfxPlatformFontList.cpp +++ b/gfx/thebes/gfxPlatformFontList.cpp @@ -901,7 +901,7 @@ gfxPlatformFontList::ResolveEmojiFontNames( void gfxPlatformFontList::GetFontFamiliesFromGenericFamilies( nsTArray& aGenericNameFamilies, - nsAtom* aLangGroup, + nsIAtom* aLangGroup, nsTArray>* aGenericFamilies) { // lookup and add platform fonts uniquely @@ -910,8 +910,7 @@ gfxPlatformFontList::GetFontFamiliesFromGenericFamilies( style.language = aLangGroup; style.systemFont = false; AutoTArray 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 c3795a072..d77c12059 100644 --- a/gfx/thebes/gfxPlatformFontList.h +++ b/gfx/thebes/gfxPlatformFontList.h @@ -386,7 +386,7 @@ protected: void GetFontFamiliesFromGenericFamilies( nsTArray& aGenericFamilies, - nsAtom* aLangGroup, + nsIAtom* aLangGroup, nsTArray>* aFontFamilies); virtual nsresult InitFontListForPlatform() = 0; -- cgit v1.2.3