Merge 94508 - <rdar://problem/10071256> Retain retired custom fonts until the next style recalc

Source/WebCore/css/CSSFontFace.cpp

Index: Source/WebCore/css/CSSFontFace.cpp
===================================================================
--- Source/WebCore/css/CSSFontFace.cpp	(revision 95343)
+++ Source/WebCore/css/CSSFontFace.cpp	(working copy)
@@ -118,6 +118,19 @@
     return 0;
 }
 
+void CSSFontFace::retireCustomFont(SimpleFontData* fontData)
+{
+    if (m_segmentedFontFaces.isEmpty()) {
+        GlyphPageTreeNode::pruneTreeCustomFontData(fontData);
+        delete fontData;
+        return;
+    }
+
+    // Use one of the CSSSegmentedFontFaces' font selector. They all have
+    // the same font selector.
+    (*m_segmentedFontFaces.begin())->fontSelector()->retireCustomFont(fontData);
+}
+
 #if ENABLE(SVG_FONTS)
 bool CSSFontFace::hasSVGFontFaceSource() const
 {