From 22cd3fed82f743ca32f9517a109a3dbe31ceda5e Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Tue, 12 May 2015 12:22:01 +0200
Subject: [PATCH] Backed out changeset cff5c0c09e72 (bug 1056479) for
 widespread destruction on a CLOSED TREE

---
 dom/ipc/ContentParent.cpp         | 2 +-
 gfx/thebes/gfxAndroidPlatform.cpp | 4 ++--
 gfx/thebes/gfxAndroidPlatform.h   | 2 +-
 gfx/thebes/gfxFT2FontList.cpp     | 2 +-
 gfx/thebes/gfxFT2FontList.h       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 42e4a15cd9b..0c2cbac6adf 100755
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -2548,7 +2548,7 @@ bool
 ContentParent::RecvReadFontList(InfallibleTArray<FontListEntry>* retValue)
 {
 #ifdef ANDROID
-    gfxAndroidPlatform::GetPlatform()->GetSystemFontList(retValue);
+    gfxAndroidPlatform::GetPlatform()->GetFontList(retValue);
 #endif
     return true;
 }
diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp
index 90e9d6487d3..e204baa9ec2 100644
--- a/gfx/thebes/gfxAndroidPlatform.cpp
+++ b/gfx/thebes/gfxAndroidPlatform.cpp
@@ -247,9 +247,9 @@ gfxAndroidPlatform::GetFontList(nsIAtom *aLangGroup,
 }
 
 void
-gfxAndroidPlatform::GetSystemFontList(InfallibleTArray<FontListEntry>* retValue)
+gfxAndroidPlatform::GetFontList(InfallibleTArray<FontListEntry>* retValue)
 {
-    gfxFT2FontList::PlatformFontList()->GetSystemFontList(retValue);
+    gfxFT2FontList::PlatformFontList()->GetFontList(retValue);
 }
 
 nsresult
diff --git a/gfx/thebes/gfxAndroidPlatform.h b/gfx/thebes/gfxAndroidPlatform.h
index 8845d145925..2f63eedc4b2 100644
--- a/gfx/thebes/gfxAndroidPlatform.h
+++ b/gfx/thebes/gfxAndroidPlatform.h
@@ -40,7 +40,7 @@ public:
       GetScaledFontForFont(mozilla::gfx::DrawTarget* aTarget, gfxFont *aFont);
 
     // to support IPC font list (sharing between chrome and content)
-    void GetSystemFontList(InfallibleTArray<FontListEntry>* retValue);
+    void GetFontList(InfallibleTArray<FontListEntry>* retValue);
 
     // platform implementations of font functions
     virtual bool IsFontFormatSupported(nsIURI *aFontURI, uint32_t aFormatFlags);
diff --git a/gfx/thebes/gfxFT2FontList.cpp b/gfx/thebes/gfxFT2FontList.cpp
index 73ec8b597f7..81ec4f8bced 100644
--- a/gfx/thebes/gfxFT2FontList.cpp
+++ b/gfx/thebes/gfxFT2FontList.cpp
@@ -1357,7 +1357,7 @@ AddHiddenFamilyToFontList(nsStringHashKey::KeyType aKey,
 }
 
 void
-gfxFT2FontList::GetSystemFontList(InfallibleTArray<FontListEntry>* retValue)
+gfxFT2FontList::GetFontList(InfallibleTArray<FontListEntry>* retValue)
 {
     mFontFamilies.Enumerate(AddFamilyToFontList, retValue);
     mHiddenFontFamilies.Enumerate(AddHiddenFamilyToFontList, retValue);
diff --git a/gfx/thebes/gfxFT2FontList.h b/gfx/thebes/gfxFT2FontList.h
index 3d7fdce9785..15dd1a38c95 100644
--- a/gfx/thebes/gfxFT2FontList.h
+++ b/gfx/thebes/gfxFT2FontList.h
@@ -134,7 +134,7 @@ public:
                                            const uint8_t* aFontData,
                                            uint32_t aLength);
 
-    void GetSystemFontList(InfallibleTArray<FontListEntry>* retValue);
+    void GetFontList(InfallibleTArray<FontListEntry>* retValue);
 
     static gfxFT2FontList* PlatformFontList() {
         return static_cast<gfxFT2FontList*>(gfxPlatformFontList::PlatformFontList());