[oilpan] Move CSSFontFace and CSSSegmentedFontFace to the managed heap

Source/core/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 19 matching lines @@
 #include "core/css/CSSFontFaceSource.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/Document.h"
 #include "RuntimeEnabledFeatures.h"
 #include "core/platform/graphics/FontDescription.h"
 #include "core/platform/graphics/SegmentedFontData.h"
 #include "core/platform/graphics/SimpleFontData.h"
 
 namespace WebCore {
 
+DEFINE_GC_TYPE_MARKER(CSSSegmentedFontFace);
+DEFINE_GC_TYPE_MARKER(CSSSegmentedFontFace::LoadFontCallback);
+
 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);
+        m_fontFaces[i]->removedFromSegmentedFontFace(Handle<CSSSegmentedFontFace>(this));
 }
 
 void CSSSegmentedFontFace::pruneTable()
 {
     // Make sure the glyph page tree prunes out all uses of this custom font.
     if (m_fontDataTable.isEmpty())
         return;
 
     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;
     }
     return false;
 }
 
-void CSSSegmentedFontFace::fontLoaded(CSSFontFace*)
+void CSSSegmentedFontFace::fontLoaded(Handle<CSSFontFace>)
 {
     pruneTable();
 
     if (RuntimeEnabledFeatures::fontLoadEventsEnabled() && !isLoading()) {
-        Vector<RefPtr<LoadFontCallback> > callbacks;
-        m_callbacks.swap(callbacks);
-        for (size_t index = 0; index < callbacks.size(); ++index) {
+        CollectionRoot<Vector<Member<LoadFontCallback> > > callbacks;
+        m_callbacks.swap(*callbacks);
+        for (size_t index = 0; index < callbacks->size(); ++index) {
             if (checkFont())
-                callbacks[index]->notifyLoaded(this);
+                callbacks->at(index)->notifyLoaded(Handle<CSSSegmentedFontFace>(this));
             else
-                callbacks[index]->notifyError(this);
+                callbacks->at(index)->notifyError(Handle<CSSSegmentedFontFace>(this));
         }
     }
 }
 
-void CSSSegmentedFontFace::appendFontFace(PassRefPtr<CSSFontFace> fontFace)
+void CSSSegmentedFontFace::appendFontFace(Handle<CSSFontFace> fontFace)
 {
     pruneTable();
-    fontFace->addedToSegmentedFontFace(this);
+    fontFace->addedToSegmentedFontFace(Handle<CSSSegmentedFontFace>(this));
     m_fontFaces.append(fontFace);
 }
 
 static void appendFontDataWithInvalidUnicodeRangeIfLoading(SegmentedFontData* newFontData, PassRefPtr<SimpleFontData> prpFaceFontData, const Vector<CSSFontFace::UnicodeRange>& ranges)
 {
     RefPtr<SimpleFontData> faceFontData = prpFaceFontData;
     if (faceFontData->isLoading()) {
         newFontData->appendRange(FontDataRange(0, 0, faceFontData));
         return;
     }
@@ skipping 57 matching lines @@
 bool CSSSegmentedFontFace::checkFont() const
 {
     unsigned size = m_fontFaces.size();
     for (unsigned i = 0; i < size; i++) {
         if (m_fontFaces[i]->loadState() != CSSFontFace::Loaded)
             return false;
     }
     return true;
 }
 
-void CSSSegmentedFontFace::loadFont(const FontDescription& fontDescription, PassRefPtr<LoadFontCallback> callback)
+void CSSSegmentedFontFace::loadFont(const FontDescription& fontDescription, Handle<LoadFontCallback> callback)
 {
     getFontData(fontDescription); // Kick off the load.
 
     if (callback) {
         if (isLoading())
             m_callbacks.append(callback);
         else if (checkFont())
-            callback->notifyLoaded(this);
+            callback->notifyLoaded(Handle<CSSSegmentedFontFace>(this));
         else
-            callback->notifyError(this);
+            callback->notifyError(Handle<CSSSegmentedFontFace>(this));
     }
 }
 
+void CSSSegmentedFontFace::accept(Visitor* visitor) const
+{
+    visitor->visit(m_fontFaces);

[zerny-google, 2013/07/02 14:24:04]

visit m_callbacks

[haraken, 2013/07/02 14:31:30]

Done.

 }
+
+}