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

Source/WebCore/css/CSSSegmentedFontFace.cpp

 /*
  * Copyright (C) 2008 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 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
 #include "config.h"
 #include "CSSSegmentedFontFace.h"
 
 #include "CSSFontFace.h"
 #include "CSSFontSelector.h"
+#include "Document.h"
 #include "FontDescription.h"
 #include "SegmentedFontData.h"
 #include "SimpleFontData.h"
 
 namespace WebCore {
 
 CSSSegmentedFontFace::CSSSegmentedFontFace(CSSFontSelector* fontSelector)
     : m_fontSelector(fontSelector)
 {
 }
 
 CSSSegmentedFontFace::~CSSSegmentedFontFace()
 {
     pruneTable();
     unsigned size = m_fontFaces.size();
     for (unsigned i = 0; i < size; i++)
         m_fontFaces[i]->removedFromSegmentedFontFace(this);
 }
 
 void CSSSegmentedFontFace::pruneTable()
 {
     // Make sure the glyph page tree prunes out all uses of this custom font.
     if (m_fontDataTable.isEmpty())
         return;
 
-    HashMap<unsigned, SegmentedFontData*>::iterator end = m_fontDataTable.end();
-    for (HashMap<unsigned, SegmentedFontData*>::iterator it = m_fontDataTable.begin(); it != end; ++it)
-        m_fontSelector->retireCustomFont(it->second);
-
     m_fontDataTable.clear();
 }
 
 bool CSSSegmentedFontFace::isValid() const
 {
     // Valid if at least one font face is valid.
     unsigned size = m_fontFaces.size();
     for (unsigned i = 0; i < size; i++) {
         if (m_fontFaces[i]->isValid())
             return true;
@@ skipping 39 matching lines @@
             const Vector<CSSFontFace::UnicodeRange>& ranges = m_fontFaces[i]->ranges();
             unsigned numRanges = ranges.size();
             if (!numRanges)
                 fontData->appendRange(FontDataRange(0, 0x7FFFFFFF, faceFontData));
             else {
                 for (unsigned j = 0; j < numRanges; ++j)
                     fontData->appendRange(FontDataRange(ranges[j].from(), ranges[j].to(), faceFontData));
             }
         }
     }
-    if (fontData->numRanges())
+    if (fontData->numRanges()) {
         m_fontDataTable.set(hashKey, fontData);
-    else {
+        ASSERT(m_fontSelector->document());
+        if (Document* doc = m_fontSelector->document())
+            doc->registerCustomFont(fontData);
+    } else {
         delete fontData;
         fontData = 0;
     }
 
     return fontData;
 }
 
 }