[oilpan] Move CSSFontFace and CSSSegmentedFontFace to the managed heap

Source/core/css/CSSSegmentedFontFace.h

Index: Source/core/css/CSSSegmentedFontFace.h
diff --git a/Source/core/css/CSSSegmentedFontFace.h b/Source/core/css/CSSSegmentedFontFace.h
index 6507d1763228f16a75b04eb1a8e93f6df624c66b..5c41bd3d43b27f13fbcda0d3929af2be0f162979 100644
--- a/Source/core/css/CSSSegmentedFontFace.h
+++ b/Source/core/css/CSSSegmentedFontFace.h
@@ -26,6 +26,7 @@
 #ifndef CSSSegmentedFontFace_h
 #define CSSSegmentedFontFace_h
 
+#include "heap/Handle.h"
 #include <wtf/HashMap.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>

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

Remove

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

Done.

@@ -40,28 +41,33 @@ class FontData;
 class FontDescription;
 class SegmentedFontData;
 
-class CSSSegmentedFontFace : public RefCounted<CSSSegmentedFontFace> {
+class CSSSegmentedFontFace : public HeapAllocatedFinalized<CSSSegmentedFontFace> {
+    DECLARE_GC_TYPE_MARKER
 public:
-    static PassRefPtr<CSSSegmentedFontFace> create(CSSFontSelector* selector) { return adoptRef(new CSSSegmentedFontFace(selector)); }
+    static Result<CSSSegmentedFontFace> create(CSSFontSelector* selector) { return adopt(new CSSSegmentedFontFace(selector)); }
     ~CSSSegmentedFontFace();
 
     CSSFontSelector* fontSelector() const { return m_fontSelector; }
 
-    void fontLoaded(CSSFontFace*);
+    void fontLoaded(Handle<CSSFontFace>);
 
-    void appendFontFace(PassRefPtr<CSSFontFace>);
+    void appendFontFace(Handle<CSSFontFace>);
 
     PassRefPtr<FontData> getFontData(const FontDescription&);
 
-    class LoadFontCallback : public RefCounted<LoadFontCallback> {
+    class LoadFontCallback : public HeapAllocatedFinalized<LoadFontCallback> {
+        DECLARE_GC_TYPE_MARKER
     public:
         virtual ~LoadFontCallback() { }
-        virtual void notifyLoaded(CSSSegmentedFontFace*) = 0;
-        virtual void notifyError(CSSSegmentedFontFace*) = 0;
+        virtual void notifyLoaded(Handle<CSSSegmentedFontFace>) = 0;
+        virtual void notifyError(Handle<CSSSegmentedFontFace>) = 0;
+        virtual void accept(Visitor*) const = 0;
     };
 
     bool checkFont() const;
-    void loadFont(const FontDescription&, PassRefPtr<LoadFontCallback> loadCallback);
+    void loadFont(const FontDescription&, Handle<LoadFontCallback> loadCallback);
+
+    void accept(Visitor*) const;
 
 private:
     CSSSegmentedFontFace(CSSFontSelector*);
@@ -72,8 +78,8 @@ private:
 
     CSSFontSelector* m_fontSelector;
     HashMap<unsigned, RefPtr<SegmentedFontData> > m_fontDataTable;
-    Vector<RefPtr<CSSFontFace>, 1> m_fontFaces;
-    Vector<RefPtr<LoadFontCallback> > m_callbacks;
+    Vector<Member<CSSFontFace>, 1> m_fontFaces;
+    Vector<Member<LoadFontCallback> > m_callbacks;
 };
 
 } // namespace WebCore