Merge 95959 - Delete retired custom font data only on document

Source/WebCore/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
@@ skipping 1512 matching lines @@
         RefPtr<RenderStyle> documentStyle = CSSStyleSelector::styleForDocument(this);
         StyleChange ch = diff(documentStyle.get(), renderer()->style());
         if (ch != NoChange)
             renderer()->setStyle(documentStyle.release());
     }
 
     for (Node* n = firstChild(); n; n = n->nextSibling())
         if (change >= Inherit || n->childNeedsStyleRecalc() || n->needsStyleRecalc())
             n->recalcStyle(change);
 
+    // FIXME: Disabling the deletion of retired custom font data until
+    // we fix all the stale style bugs (68804, 68624, etc). These bugs
+    // indicate problems where some styles were not updated in recalcStyle,
+    // thereby retaining stale copy of font data. To prevent that, we
+    // disable this code for now and only delete retired custom font data
+    // in Document destructor.
     // Now that all RenderStyles that pointed to retired fonts have been updated, the fonts can safely be deleted.
-    deleteRetiredCustomFonts();
+    // deleteRetiredCustomFonts();
 
 #if USE(ACCELERATED_COMPOSITING)
     if (view()) {
         bool layoutPending = view()->layoutPending() || renderer()->needsLayout();
         // If we didn't update compositing layers because of layout(), we need to do so here.
         if (!layoutPending)
             view()->updateCompositingLayers();
     }
 #endif
 
@@ skipping 3545 matching lines @@
     if (!loader)
         return 0;
     
     if (m_frame->document() != this)
         return 0;
     
     return loader;
 }
 
 } // namespace WebCore