Merge 97402 - Source/WebCore: Register custom fonts at their creation time, rather than at retire...

Source/WebCore/css/CSSFontSelector.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * 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
@@ skipping 365 matching lines @@
 void CSSFontSelector::fontLoaded()
 {
     dispatchInvalidationCallbacks();
 }
 
 void CSSFontSelector::fontCacheInvalidated()
 {
     dispatchInvalidationCallbacks();
 }
 
-void CSSFontSelector::retireCustomFont(FontData* fontData)
-{
-    if (m_document)
-        m_document->retireCustomFont(fontData);
-    else {
-        GlyphPageTreeNode::pruneTreeCustomFontData(fontData);
-        delete fontData;
-    }
-}
-
 static FontData* fontDataForGenericFamily(Document* document, const FontDescription& fontDescription, const AtomicString& familyName)
 {
     if (!document || !document->frame())
         return 0;
 
     const Settings* settings = document->frame()->settings();
     if (!settings)
         return 0;
 
     AtomicString genericFamily;
@@ skipping 173 matching lines @@
         unsigned numCandidates = candidateFontFaces.size();
         for (unsigned i = 0; i < numCandidates; ++i)
             face->appendFontFace(candidateFontFaces[i]);
     }
 
     // We have a face.  Ask it for a font data.  If it cannot produce one, it will fail, and the OS will take over.
     return face->getFontData(fontDescription);
 }
 
 }