Revert of [Oilpan]: Moving the FontSelector/FontCacheClient, CSSSegmentedFontFace, and FontFaceCache to the o…

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 f495c038f13fa1c6d9828654883e2e2ae2c5ac62..119f709fc456d087cb4c6d86a8bceff187ef7ebb 100644
--- a/Source/core/css/CSSSegmentedFontFace.h
+++ b/Source/core/css/CSSSegmentedFontFace.h
@@ -27,7 +27,6 @@
 #define CSSSegmentedFontFace_h
 
 #include "platform/fonts/FontTraits.h"
-#include "platform/heap/Handle.h"
 #include "wtf/HashMap.h"
 #include "wtf/ListHashSet.h"
 #include "wtf/PassRefPtr.h"
@@ -44,11 +43,11 @@
 class FontFace;
 class SegmentedFontData;
 
-class CSSSegmentedFontFace : public RefCountedWillBeGarbageCollectedFinalized<CSSSegmentedFontFace> {
+class CSSSegmentedFontFace : public RefCounted<CSSSegmentedFontFace> {
 public:
-    static PassRefPtrWillBeRawPtr<CSSSegmentedFontFace> create(CSSFontSelector* selector, FontTraits traits)
+    static PassRefPtr<CSSSegmentedFontFace> create(CSSFontSelector* selector, FontTraits traits)
     {
-        return adoptRefWillBeNoop(new CSSSegmentedFontFace(selector, traits));
+        return adoptRef(new CSSSegmentedFontFace(selector, traits));
     }
     ~CSSSegmentedFontFace();
 
@@ -68,8 +67,6 @@
     void match(const String&, Vector<RefPtr<FontFace> >&) const;
     void willUseFontData(const FontDescription&);
 
-    void trace(Visitor* visitor) { visitor->trace(m_fontSelector); }
-
 private:
     CSSSegmentedFontFace(CSSFontSelector*, FontTraits);
 
@@ -80,7 +77,7 @@
 
     typedef ListHashSet<RefPtr<FontFace> > FontFaceList;
 
-    RawPtrWillBeMember<CSSFontSelector> m_fontSelector;
+    CSSFontSelector* m_fontSelector;
     FontTraits m_traits;
     HashMap<unsigned, RefPtr<SegmentedFontData> > m_fontDataTable;
     // All non-CSS-connected FontFaces are stored after the CSS-connected ones.