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

Source/core/css/FontFaceCache.h

Index: Source/core/css/FontFaceCache.h
diff --git a/Source/core/css/FontFaceCache.h b/Source/core/css/FontFaceCache.h
index 4aa69558b2d3a5c7c89529055bb08d3be83d633b..1b6873b01867edeef40c7241d6129a0396dfd965 100644
--- a/Source/core/css/FontFaceCache.h
+++ b/Source/core/css/FontFaceCache.h
@@ -27,7 +27,6 @@
 #ifndef FontFaceCache_h
 #define FontFaceCache_h
 
-#include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 #include "wtf/ListHashSet.h"
@@ -41,7 +40,7 @@
 class FontDescription;
 class StyleRuleFontFace;
 
-class FontFaceCache FINAL : NoBaseWillBeGarbageCollectedFinalized<FontFaceCache> {
+class FontFaceCache {
 public:
     FontFaceCache();
 
@@ -61,11 +60,9 @@
 
     unsigned version() const { return m_version; }
 
-    void trace(Visitor*);
-
 private:
-    typedef WillBeHeapHashMap<unsigned, RefPtrWillBeMember<CSSSegmentedFontFace> > TraitsMap;
-    typedef WillBeHeapHashMap<String, OwnPtrWillBeMember<TraitsMap>, CaseFoldingHash> FamilyToTraitsMap;
+    typedef HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > TraitsMap;
+    typedef HashMap<String, OwnPtr<TraitsMap>, CaseFoldingHash> FamilyToTraitsMap;
     typedef HashMap<const StyleRuleFontFace*, RefPtr<FontFace> > StyleRuleToFontFace;
     FamilyToTraitsMap m_fontFaces;
     FamilyToTraitsMap m_fonts;