From 1bf2972cd9935d83aecb2883af1e8bdfb6bbecfc Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Wed, 9 Jul 2014 13:44:14 +0200
Subject: [PATCH] Backed out changeset 091a5ced91cd (bug 1031187)

---
 gfx/thebes/gfxFont.h          |  6 +-----
 gfx/thebes/gfxUserFontSet.cpp |  3 ---
 gfx/thebes/gfxUserFontSet.h   | 12 ++----------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/gfx/thebes/gfxFont.h b/gfx/thebes/gfxFont.h
index 898a295a0d93..de8d3a66157d 100644
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -818,11 +818,7 @@ public:
         {
             aFontEntry->mIgnoreGDEF = true;
         }
-        if (aFontEntry->mFamilyName.IsEmpty()) {
-            aFontEntry->mFamilyName = Name();
-        } else {
-            MOZ_ASSERT(aFontEntry->mFamilyName.Equals(Name()));
-        }
+        aFontEntry->mFamilyName = Name();
         aFontEntry->mSkipDefaultFeatureSpaceCheck = mSkipDefaultFeatureSpaceCheck;
         mAvailableFonts.AppendElement(aFontEntry);
     }
diff --git a/gfx/thebes/gfxUserFontSet.cpp b/gfx/thebes/gfxUserFontSet.cpp
index e5eed7e62c83..f6d10506a74d 100644
--- a/gfx/thebes/gfxUserFontSet.cpp
+++ b/gfx/thebes/gfxUserFontSet.cpp
@@ -355,7 +355,6 @@ gfxProxyFontEntry::LoadNext(gfxMixedFontFamily *aFamily,
                      uint32_t(mFontSet->mGeneration)));
                 fe->mFeatureSettings.AppendElements(mFeatureSettings);
                 fe->mLanguageOverride = mLanguageOverride;
-                fe->mFamilyName = mFamilyName;
                 // For src:local(), we don't care whether the request is from
                 // a private window as there's no issue of caching resources;
                 // local fonts are just available all the time.
@@ -529,7 +528,6 @@ gfxProxyFontEntry::LoadFont(gfxMixedFontFamily *aFamily,
         // newly-created font entry
         fe->mFeatureSettings.AppendElements(mFeatureSettings);
         fe->mLanguageOverride = mLanguageOverride;
-        fe->mFamilyName = mFamilyName;
         StoreUserFontData(fe, mFontSet->GetPrivateBrowsing(), originalFullName,
                           &metadata, metaOrigLen);
 #ifdef PR_LOGGING
@@ -644,7 +642,6 @@ gfxUserFontSet::AddFontFace(const nsAString& aFamilyName,
                               aFeatureSettings,
                               aLanguageOverride,
                               aUnicodeRanges);
-    proxyEntry->mFamilyName = aFamilyName;
     family->AddFontEntry(proxyEntry);
 #ifdef PR_LOGGING
     if (LOG_ENABLED()) {
diff --git a/gfx/thebes/gfxUserFontSet.h b/gfx/thebes/gfxUserFontSet.h
index 18c40ad65b53..32a6da14bed2 100644
--- a/gfx/thebes/gfxUserFontSet.h
+++ b/gfx/thebes/gfxUserFontSet.h
@@ -103,11 +103,7 @@ public:
                 break;
             }
         }
-        if (aFontEntry->mFamilyName.IsEmpty()) {
-            aFontEntry->mFamilyName = Name();
-        } else {
-            MOZ_ASSERT(aFontEntry->mFamilyName.Equals(Name()));
-        }
+        aFontEntry->mFamilyName = Name();
         ResetCharacterMap();
     }
 
@@ -122,11 +118,7 @@ public:
                 // Note that this may delete aProxyFontEntry, if there's no
                 // other reference to it except from its family.
                 mAvailableFonts[i] = aRealFontEntry;
-                if (aRealFontEntry->mFamilyName.IsEmpty()) {
-                    aRealFontEntry->mFamilyName = Name();
-                } else {
-                    MOZ_ASSERT(aRealFontEntry->mFamilyName.Equals(Name()));
-                }
+                aRealFontEntry->mFamilyName = Name();
                 break;
             }
         }