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

Source/core/css/CSSFontSelector.h

Index: Source/core/css/CSSFontSelector.h
diff --git a/Source/core/css/CSSFontSelector.h b/Source/core/css/CSSFontSelector.h
index bee31c288cb2d0db9f2a84e846f45181f5c1bbac..e0b1d7a4321447eee3a59062701bc23560c911c4 100644
--- a/Source/core/css/CSSFontSelector.h
+++ b/Source/core/css/CSSFontSelector.h
@@ -48,7 +48,6 @@
 class StyleRuleFontFace;
 
 class FontLoader {
-    DISALLOW_ALLOCATION();
 public:
     explicit FontLoader(ResourceFetcher*);
 
@@ -56,8 +55,6 @@
     void loadPendingFonts();
 
     void clearResourceFetcher();
-
-    void trace(Visitor*) { }
 
 private:
     void beginLoadTimerFired(Timer<FontLoader>*);
@@ -69,9 +66,9 @@
 
 class CSSFontSelector FINAL : public FontSelector {
 public:
-    static PassRefPtrWillBeRawPtr<CSSFontSelector> create(Document* document)
+    static PassRefPtr<CSSFontSelector> create(Document* document)
     {
-        return adoptRefWillBeNoop(new CSSFontSelector(document));
+        return adoptRef(new CSSFontSelector(document));
     }
     virtual ~CSSFontSelector();
 
@@ -101,8 +98,6 @@
     void beginLoadingFontSoon(FontResource*);
     void loadPendingFonts();
 
-    virtual void trace(Visitor*);
-
 private:
     explicit CSSFontSelector(Document*);
 
@@ -111,7 +106,7 @@
     Document* m_document;
     // FIXME: Move to Document or StyleEngine.
     FontFaceCache m_fontFaceCache;
-    WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient> > m_clients;
+    WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient> > m_clients;
 
     FontLoader m_fontLoader;
     GenericFontFamilySettings m_genericFontFamilySettings;