[oilpan] Move CSSSegmentedFontFace to the managed heap

Source/core/css/CSSFontSelector.cpp

 /*
  * Copyright (C) 2007, 2008, 2011 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 60 matching lines @@
     // seem to be any such guarantee.
 
     ASSERT(m_document);
     fontCache()->addClient(this);
 }
 
 CSSFontSelector::~CSSFontSelector()
 {
     clearDocument();
     fontCache()->removeClient(this);
+
+    // FIXME(oilpan): This is code to clear a back pointer from CSSSegmentedFontFace to CSSFontSelector.
+    // We should remove this hack by moving CSSFontSelector to the managed heap and having the
+    // CSSFontSelector hold Member<CSSSegmentedFontFace>.

[haraken, 2013/07/09 07:10:53]

This is the part where I'm clearing the back pointer.

+    for (HashMap<String, OwnPtr<SegmentedFontFaceHashMap>, WTF::FastAllocator, CaseFoldingHash>::iterator it = m_fonts.begin(); it != m_fonts.end(); ++it) {
+        SegmentedFontFaceHashMap* segmentedFontFaceHashMap = it->value.get();
+        for (SegmentedFontFaceHashMap::iterator it2 = segmentedFontFaceHashMap->begin(); it2 != segmentedFontFaceHashMap->end(); ++it2)
+            it2->value->clearFontSelector();
+    }
 }
 
 bool CSSFontSelector::isEmpty() const
 {
     return m_fonts.isEmpty();
 }
 
 void CSSFontSelector::addFontFaceRule(const Handle<StyleRuleFontFace>& fontFaceRule)
 {
     // Obtain the font-family property and the src property.  Both must be defined.
@@ skipping 389 matching lines @@
 PassRefPtr<FontData> CSSFontSelector::getFontData(const FontDescription& fontDescription, const AtomicString& familyName)
 {
     if (m_fontFaces.isEmpty()) {
         if (familyName.startsWith("-webkit-"))
             return fontDataForGenericFamily(m_document, fontDescription, familyName);
         if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont())
             return fontDataForGenericFamily(m_document, fontDescription, "-webkit-standard");
         return 0;
     }
 
-    CSSSegmentedFontFace* face = getFontFace(fontDescription, familyName);
+    Handle<CSSSegmentedFontFace> face = getFontFace(fontDescription, familyName);
     // If no face was found, then return 0 and let the OS come up with its best match for the name.
     if (!face) {
         // If we were handed a generic family, but there was no match, go ahead and return the correct font based off our
         // settings.
         if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont())
             return fontDataForGenericFamily(m_document, fontDescription, "-webkit-standard");
         return fontDataForGenericFamily(m_document, fontDescription, familyName);
     }
 
     // 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);
 }
 
-CSSSegmentedFontFace* CSSFontSelector::getFontFace(const FontDescription& fontDescription, const AtomicString& family)
+Result<CSSSegmentedFontFace> CSSFontSelector::getFontFace(const FontDescription& fontDescription, const AtomicString& family)
 {
     Vector<RefPtr<CSSFontFace> >* familyFontFaces = m_fontFaces.get(family);
     if (!familyFontFaces || familyFontFaces->isEmpty())
-        return 0;
+        return nullptr;
 
-    OwnPtr<HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > >& segmentedFontFaceCache = m_fonts.add(family, nullptr).iterator->value;
+    OwnPtr<HashMap<unsigned, Persistent<CSSSegmentedFontFace> > >& segmentedFontFaceCache = m_fonts.add(family, nullptr).iterator->value;
     if (!segmentedFontFaceCache)
-        segmentedFontFaceCache = adoptPtr(new HashMap<unsigned, RefPtr<CSSSegmentedFontFace> >);
+        segmentedFontFaceCache = adoptPtr(new HashMap<unsigned, Persistent<CSSSegmentedFontFace> >());
 
     FontTraitsMask traitsMask = fontDescription.traitsMask();
 
-    RefPtr<CSSSegmentedFontFace>& face = segmentedFontFaceCache->add(traitsMask, 0).iterator->value;
+    Handle<CSSSegmentedFontFace> face = segmentedFontFaceCache->add(traitsMask, nullptr).iterator->value;
     if (!face) {
         face = CSSSegmentedFontFace::create(this);
+        segmentedFontFaceCache->set(traitsMask, face);
 
         // Collect all matching faces and sort them in order of preference.
         Vector<CSSFontFace*, 32> candidateFontFaces;
         for (int i = familyFontFaces->size() - 1; i >= 0; --i) {
             CSSFontFace* candidate = familyFontFaces->at(i).get();
             unsigned candidateTraitsMask = candidate->traitsMask();
             if ((traitsMask & FontStyleNormalMask) && !(candidateTraitsMask & FontStyleNormalMask))
                 continue;
             if ((traitsMask & FontVariantNormalMask) && !(candidateTraitsMask & FontVariantNormalMask))
                 continue;
@@ skipping 18 matching lines @@
                 candidateFontFaces.append(candidate);
             }
         }
 
         desiredTraitsMaskForComparison = traitsMask;
         stable_sort(candidateFontFaces.begin(), candidateFontFaces.end(), compareFontFaces);
         unsigned numCandidates = candidateFontFaces.size();
         for (unsigned i = 0; i < numCandidates; ++i)
             face->appendFontFace(candidateFontFaces[i]);
     }
-    return face.get();
+    return face;
 }
 
 void CSSFontSelector::clearDocument()
 {
     if (!m_document) {
         ASSERT(!m_beginLoadingTimer.isActive());
         ASSERT(m_fontsToBeginLoading.isEmpty());
         return;
     }
 
@@ skipping 39 matching lines @@
     }
     // Ensure that if the request count reaches zero, the frame loader will know about it.
     cachedResourceLoader->loadDone(0);
     // New font loads may be triggered by layout after the document load is complete but before we have dispatched
     // didFinishLoading for the frame. Make sure the delegate is always dispatched by checking explicitly.
     if (m_document && m_document->frame())
         m_document->frame()->loader()->checkLoadComplete();
 }
 
 }