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

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 54 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)
-        m_face->retireCustomFont(it->second);
-
     m_fontDataTable.clear();
 }
 
 bool CSSFontFaceSource::isLoaded() const
 {
     if (m_font)
         return m_font->isLoaded();
     return true;
 }
 
@@ skipping 98 matching lines @@
             m_loadStartTimer.startOneShot(0);
 
         // This temporary font is not retained and should not be returned.
         FontCachePurgePreventer fontCachePurgePreventer;
         SimpleFontData* temporaryFont = fontCache()->getNonRetainedLastResortFallbackFont(fontDescription);
         fontData = adoptPtr(new SimpleFontData(temporaryFont->platformData(), true, true));
     }
 
     SimpleFontData* fontDataRawPtr = fontData.leakPtr();
     m_fontDataTable.set(hashKey, fontDataRawPtr);
+    ASSERT(fontSelector->document());
+    if (Document* doc = fontSelector->document())
+        doc->registerCustomFont(fontDataRawPtr);
 
     return fontDataRawPtr;
 }
 
 void CSSFontFaceSource::startLoadingTimerFired(Timer<WebCore::CSSFontFaceSource>*)
 {
     ASSERT(m_font);
     ASSERT(m_fontSelector);
 
     if (CachedResourceLoader* cachedResourceLoader = m_fontSelector->cachedResourceLoader())
@@ skipping 13 matching lines @@
     m_svgFontFaceElement = element;
 }
 
 bool CSSFontFaceSource::isSVGFontFaceSource() const
 {
     return m_svgFontFaceElement || m_hasExternalSVGFont;
 }
 #endif
 
 }