☠☠ backed out by 70244d662f4f ☠ ☠ | |
author | John Daggett <jdaggett@mozilla.com> |
Tue, 12 May 2015 17:44:03 +0900 | |
changeset 243503 | cff5c0c09e7278ed2b7868771bb6505f576d943c |
parent 243483 | 6afb088b0cff22dcbdf88ba0d5c1291889d1e7e8 |
child 243504 | 8bd3335d77d2a892b2bab9400e71a784f23b7816 |
push id | 28741 |
push user | kwierso@gmail.com |
push date | Tue, 12 May 2015 23:24:40 +0000 |
treeherder | mozilla-central@d476776d920d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | m_kato |
bugs | 1056479 |
milestone | 40.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -2543,17 +2543,17 @@ ContentParent::RecvReadPrefsArray(Infall Preferences::GetPreferences(aPrefs); return true; } bool ContentParent::RecvReadFontList(InfallibleTArray<FontListEntry>* retValue) { #ifdef ANDROID - gfxAndroidPlatform::GetPlatform()->GetFontList(retValue); + gfxAndroidPlatform::GetPlatform()->GetSystemFontList(retValue); #endif return true; } bool ContentParent::RecvReadPermissions(InfallibleTArray<IPC::Permission>* aPermissions) { #ifdef MOZ_PERMISSIONS
--- a/gfx/thebes/gfxAndroidPlatform.cpp +++ b/gfx/thebes/gfxAndroidPlatform.cpp @@ -242,19 +242,19 @@ gfxAndroidPlatform::GetFontList(nsIAtom { gfxPlatformFontList::PlatformFontList()->GetFontList(aLangGroup, aGenericFamily, aListOfFonts); return NS_OK; } void -gfxAndroidPlatform::GetFontList(InfallibleTArray<FontListEntry>* retValue) +gfxAndroidPlatform::GetSystemFontList(InfallibleTArray<FontListEntry>* retValue) { - gfxFT2FontList::PlatformFontList()->GetFontList(retValue); + gfxFT2FontList::PlatformFontList()->GetSystemFontList(retValue); } nsresult gfxAndroidPlatform::UpdateFontList() { gfxPlatformFontList::PlatformFontList()->UpdateFontList(); return NS_OK; }
--- a/gfx/thebes/gfxAndroidPlatform.h +++ b/gfx/thebes/gfxAndroidPlatform.h @@ -35,17 +35,17 @@ public: gfxContentType contentType); virtual gfxImageFormat GetOffscreenFormat() { return mOffscreenFormat; } mozilla::TemporaryRef<mozilla::gfx::ScaledFont> 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); virtual gfxPlatformFontList* CreatePlatformFontList(); virtual gfxFontEntry* LookupLocalFont(const nsAString& aFontName, uint16_t aWeight, int16_t aStretch, bool aItalic);
--- a/gfx/thebes/gfxFT2FontList.cpp +++ b/gfx/thebes/gfxFT2FontList.cpp @@ -1352,17 +1352,17 @@ AddHiddenFamilyToFontList(nsStringHashKe FT2FontFamily *family = static_cast<FT2FontFamily*>(aFamily.get()); family->AddFacesToFontList(fontlist, FT2FontFamily::kHidden); return PL_DHASH_NEXT; } void -gfxFT2FontList::GetFontList(InfallibleTArray<FontListEntry>* retValue) +gfxFT2FontList::GetSystemFontList(InfallibleTArray<FontListEntry>* retValue) { mFontFamilies.Enumerate(AddFamilyToFontList, retValue); mHiddenFontFamilies.Enumerate(AddHiddenFamilyToFontList, retValue); } static void LoadSkipSpaceLookupCheck(nsTHashtable<nsStringHashKey>& aSkipSpaceLookupCheck) {
--- a/gfx/thebes/gfxFT2FontList.h +++ b/gfx/thebes/gfxFT2FontList.h @@ -129,17 +129,17 @@ public: virtual gfxFontEntry* MakePlatformFont(const nsAString& aFontName, uint16_t aWeight, int16_t aStretch, bool aItalic, 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()); } virtual void GetFontFamilyList(nsTArray<nsRefPtr<gfxFontFamily> >& aFamilyArray); protected: