backout changeset bcd556d83109 (bug 721315) for reftest orange.
authorJonathan Kew <jfkthame@gmail.com>
Sat, 28 Jan 2012 09:37:15 +0000
changeset 86880 f35f0858a5b4234ef477c0d88c48b2ef05744163
parent 86879 2ea682dba295dfc7a250a7c942905bac1ee7aff8
child 86881 cb21301bbdd3408124b9235196fcc187087fcd61
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs721315
milestone12.0a1
backs outbcd556d831090f8bc73b5cc7b233d3d03667f64f
backout changeset bcd556d83109 (bug 721315) for reftest orange.
gfx/thebes/gfxFont.h
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -507,28 +507,17 @@ public:
         mOtherFamilyNamesInitialized(false),
         mHasOtherFamilyNames(false),
         mFaceNamesInitialized(false),
         mHasStyles(false),
         mIsSimpleFamily(false),
         mIsBadUnderlineFamily(false)
         { }
 
-    virtual ~gfxFontFamily() {
-        // clear Family pointers in our faces; the font entries might stay
-        // alive due to cached font objects, but they can no longer refer
-        // to their families.
-        PRUint32 i = mAvailableFonts.Length();
-        while (i) {
-             gfxFontEntry *fe = mAvailableFonts[--i];
-             if (fe) {
-                 fe->SetFamily(nsnull);
-             }
-        }
-    }
+    virtual ~gfxFontFamily() { }
 
     const nsString& Name() { return mName; }
 
     virtual void LocalizedName(nsAString& aLocalizedName);
     virtual bool HasOtherFamilyNames();
     
     nsTArray<nsRefPtr<gfxFontEntry> >& GetFontList() { return mAvailableFonts; }