[oilpan] Move CSSFontFace and CSSSegmentedFontFace to the managed heap

Source/core/css/CSSFontFace.h

 /*
  * Copyright (C) 2007, 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 11 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef CSSFontFace_h
 #define CSSFontFace_h
 
 #include "core/css/CSSFontFaceRule.h"
 #include "core/css/CSSFontFaceSource.h"
 #include "core/platform/graphics/FontTraitsMask.h"
+#include "heap/Handle.h"
 #include <wtf/Forward.h>
 #include <wtf/HashSet.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.

 #include <wtf/unicode/Unicode.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
 class CSSSegmentedFontFace;
 class FontDescription;
 class SimpleFontData;
 
-class CSSFontFace : public RefCounted<CSSFontFace> {
+class CSSFontFace : public HeapAllocatedFinalized<CSSFontFace> {
+    DECLARE_GC_TYPE_MARKER
 public:
-    static PassRefPtr<CSSFontFace> create(FontTraitsMask traitsMask, Handle<CSSFontFaceRule> rule, bool isLocalFallback = false) { return adoptRef(new CSSFontFace(traitsMask, rule, isLocalFallback)); }
+    static Result<CSSFontFace> create(FontTraitsMask traitsMask, Handle<CSSFontFaceRule> rule, bool isLocalFallback = false) { return adopt(new CSSFontFace(traitsMask, rule, isLocalFallback)); }
 
     FontTraitsMask traitsMask() const { return m_traitsMask; }
 
     struct UnicodeRange;
 
     void addRange(UChar32 from, UChar32 to) { m_ranges.append(UnicodeRange(from, to)); }
     const Vector<UnicodeRange>& ranges() const { return m_ranges; }
 
-    void addedToSegmentedFontFace(CSSSegmentedFontFace*);
-    void removedFromSegmentedFontFace(CSSSegmentedFontFace*);
+    void addedToSegmentedFontFace(Handle<CSSSegmentedFontFace>);
+    void removedFromSegmentedFontFace(Handle<CSSSegmentedFontFace>);
 
     bool isLoaded() const;
     bool isValid() const;
 
     bool isLocalFallback() const { return m_isLocalFallback; }
 
     void addSource(PassOwnPtr<CSSFontFaceSource>);
 
     void fontLoaded(CSSFontFaceSource*);
 
@@ skipping 14 matching lines @@
         UChar32 m_to;
     };
 
 #if ENABLE(SVG_FONTS)
     bool hasSVGFontFaceSource() const;
 #endif
 
     enum LoadState { NotLoaded, Loading, Loaded, Error };
     LoadState loadState() const { return m_loadState; }
 
+    void accept(Visitor*) const { }

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

visit m_segmentedFontFaces and m_rule.

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

This is a big mistake... Done.

+
 private:
     CSSFontFace(FontTraitsMask traitsMask, Handle<CSSFontFaceRule> rule, bool isLocalFallback)
         : m_traitsMask(traitsMask)
         , m_activeSource(0)
         , m_isLocalFallback(isLocalFallback)
         , m_loadState(isLocalFallback ? Loaded : NotLoaded)
         , m_rule(rule)
     {
         UNUSED_PARAM(rule);
     }
 
     FontTraitsMask m_traitsMask;
     Vector<UnicodeRange> m_ranges;
-    HashSet<CSSSegmentedFontFace*> m_segmentedFontFaces;
+    HashSet<Member<CSSSegmentedFontFace> > m_segmentedFontFaces;
     Vector<OwnPtr<CSSFontFaceSource> > m_sources;
     CSSFontFaceSource* m_activeSource;
     bool m_isLocalFallback;
     LoadState m_loadState;
-    Persistent<CSSFontFaceRule> m_rule;
+    Member<CSSFontFaceRule> m_rule;
     void notifyFontLoader(LoadState);
 };
 
 }
 
 #endif