wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1056479 p0 - rename ambiguous GetFontList method in Android fontlist. r=m_kato

Browse Source
This commit is contained in:
John Daggett 2015-05-12 14:51:17 +09:00
parent 74ce6aa434
commit b4535f2aae
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/ipc/ContentParent.cpp
View File

@ -2548,7 +2548,7 @@ bool
ContentParent::RecvReadFontList(InfallibleTArray<FontListEntry>* retValue)
{
#ifdef ANDROID
gfxAndroidPlatform::GetPlatform()->GetFontList(retValue);
gfxAndroidPlatform::GetPlatform()->GetSystemFontList(retValue);
#endif
return true;
}

4
gfx/thebes/gfxAndroidPlatform.cpp
View File

@ -247,9 +247,9 @@ gfxAndroidPlatform::GetFontList(nsIAtom *aLangGroup,
}
void
gfxAndroidPlatform::GetFontList(InfallibleTArray<FontListEntry>* retValue)
gfxAndroidPlatform::GetSystemFontList(InfallibleTArray<FontListEntry>* retValue)
{
gfxFT2FontList::PlatformFontList()->GetFontList(retValue);
gfxFT2FontList::PlatformFontList()->GetSystemFontList(retValue);
}
nsresult

2
gfx/thebes/gfxAndroidPlatform.h
View File

@ -40,7 +40,7 @@ public:
GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont);
// to support IPC font list (sharing between chrome and content)
void GetFontList(InfallibleTArray<FontListEntry>* retValue);
void GetSystemFontList(InfallibleTArray<FontListEntry>* retValue);
// platform implementations of font functions
virtual bool IsFontFormatSupported(nsIURI *aFontURI, uint32_t aFormatFlags);

2
gfx/thebes/gfxFT2FontList.cpp
View File

@ -1357,7 +1357,7 @@ AddHiddenFamilyToFontList(nsStringHashKey::KeyType aKey,
}
void
gfxFT2FontList::GetFontList(InfallibleTArray<FontListEntry>* retValue)
gfxFT2FontList::GetSystemFontList(InfallibleTArray<FontListEntry>* retValue)
{
mFontFamilies.Enumerate(AddFamilyToFontList, retValue);
mHiddenFontFamilies.Enumerate(AddHiddenFamilyToFontList, retValue);

2
gfx/thebes/gfxFT2FontList.h
View File

@ -134,7 +134,7 @@ public:
const uint8_t* aFontData,
uint32_t aLength);
void GetFontList(InfallibleTArray<FontListEntry>* retValue);
void GetSystemFontList(InfallibleTArray<FontListEntry>* retValue);
static gfxFT2FontList* PlatformFontList() {
return static_cast<gfxFT2FontList*>(gfxPlatformFontList::PlatformFontList());