[oilpan] Move CSSFontFace to the managed heap

Source/core/css/CSSFontFace.cpp

 /*
  * Copyright (C) 2007, 2008, 2011 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 "core/css/CSSFontFace.h"
 
 #include "core/css/CSSFontFaceSource.h"
 #include "core/css/CSSFontSelector.h"
-#include "core/css/CSSSegmentedFontFace.h"
 #include "core/css/FontLoader.h"
 #include "core/dom/Document.h"
 #include "RuntimeEnabledFeatures.h"
 #include "core/platform/graphics/FontDescription.h"
 #include "core/platform/graphics/SimpleFontData.h"
 
 namespace WebCore {
 
+DEFINE_GC_TYPE_MARKER(CSSFontFace);
+
 bool CSSFontFace::isLoaded() const
 {
     size_t size = m_sources.size();
     for (size_t i = 0; i < size; i++) {
         if (!m_sources[i]->isLoaded())
             return false;
     }
     return true;
 }
 
 bool CSSFontFace::isValid() const
 {
     size_t size = m_sources.size();
     for (size_t i = 0; i < size; i++) {
         if (m_sources[i]->isValid())
             return true;
     }
     return false;
 }
 
+// FIXME(oilpan): Move CSSFontFaceSource to the managed heap and remove this.
+// Then CSSFontFaceSource and CSSFontFace die in the same round of GC,
+// and thus we don't need to call dispose().
+void CSSFontFace::dispose()
+{
+    m_sources.clear();
+}
+
 void CSSFontFace::addedToSegmentedFontFace(Handle<CSSSegmentedFontFace> segmentedFontFace)
 {
-    m_segmentedFontFaces.add(segmentedFontFace.raw());
-}
-
-void CSSFontFace::removedFromSegmentedFontFace(Handle<CSSSegmentedFontFace> segmentedFontFace)
-{
-    m_segmentedFontFaces.remove(segmentedFontFace.raw());
+    m_segmentedFontFaces.add(segmentedFontFace);
 }
 
 void CSSFontFace::addSource(PassOwnPtr<CSSFontFaceSource> source)
 {
-    source->setFontFace(this);
+    source->setFontFace(Handle<CSSFontFace>(this));
     m_sources.append(source);
 }
 
 void CSSFontFace::fontLoaded(CSSFontFaceSource* source)
 {
     if (source != m_activeSource)
         return;
 
     // FIXME: Can we assert that m_segmentedFontFaces is not empty? That may
     // require stopping in-progress font loading when the last
     // CSSSegmentedFontFace is removed.
     if (m_segmentedFontFaces.isEmpty())
         return;
 
     // Use one of the CSSSegmentedFontFaces' font selector. They all have
     // the same font selector, so it's wasteful to store it in the CSSFontFace.
     CSSFontSelector* fontSelector = (*m_segmentedFontFaces.begin())->fontSelector();
     ASSERT(fontSelector);
     fontSelector->fontLoaded();
 
     if (RuntimeEnabledFeatures::fontLoadEventsEnabled() && m_loadState == Loading) {
         if (source->ensureFontData())
             notifyFontLoader(Loaded);
         else if (!isValid())
             notifyFontLoader(Error);
     }
 
-    HashSet<CSSSegmentedFontFace*>::iterator end = m_segmentedFontFaces.end();
-    for (HashSet<CSSSegmentedFontFace*>::iterator it = m_segmentedFontFaces.begin(); it != end; ++it)
-        (*it)->fontLoaded(this);
+    HashSet<Member<CSSSegmentedFontFace> >::iterator end = m_segmentedFontFaces.end();
+    for (HashSet<Member<CSSSegmentedFontFace> >::iterator it = m_segmentedFontFaces.begin(); it != end; ++it) {
+        HandleScope scope;
+        (*it)->fontLoaded(Handle<CSSFontFace>(this));
+    }
 }
 
 PassRefPtr<SimpleFontData> CSSFontFace::getFontData(const FontDescription& fontDescription, bool syntheticBold, bool syntheticItalic)
 {
     m_activeSource = 0;
     if (!isValid())
         return 0;
 
     ASSERT(!m_segmentedFontFaces.isEmpty());
     CSSFontSelector* fontSelector = (*m_segmentedFontFaces.begin())->fontSelector();
@@ skipping 47 matching lines @@
 {
     size_t size = m_sources.size();
     for (size_t i = 0; i < size; i++) {
         if (m_sources[i]->isSVGFontFaceSource())
             return true;
     }
     return false;
 }
 #endif
 
+void CSSFontFace::accept(Visitor* visitor) const
+{
+    visitor->visit(m_rule);
+    visitor->visit(m_segmentedFontFaces);
 }
+
+}