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

Source/WebCore/css/CSSFontFaceSource.cpp

 /*
  * Copyright (C) 2007, 2008, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 51 matching lines @@
 {
     if (m_font)
         m_font->removeClient(this);
     pruneTable();
 }
 
 void CSSFontFaceSource::pruneTable()
 {
     if (m_fontDataTable.isEmpty())
         return;
+
     HashMap<unsigned, SimpleFontData*>::iterator end = m_fontDataTable.end();
     for (HashMap<unsigned, SimpleFontData*>::iterator it = m_fontDataTable.begin(); it != end; ++it)
-        GlyphPageTreeNode::pruneTreeCustomFontData(it->second);
-    deleteAllValues(m_fontDataTable);
+        m_face->retireCustomFont(it->second);
+
     m_fontDataTable.clear();
 }
 
 bool CSSFontFaceSource::isLoaded() const
 {
     if (m_font)
         return m_font->isLoaded();
     return true;
 }
 
@@ skipping 114 matching lines @@
     m_svgFontFaceElement = element;
 }
 
 bool CSSFontFaceSource::isSVGFontFaceSource() const
 {
     return m_svgFontFaceElement || m_hasExternalSVGFont;
 }
 #endif
 
 }