[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 1b6873b01867edeef40c7241d6129a0396dfd965..11e5d2e6fe59c360a0c1a91dfd0093def6412c51 100644
--- a/Source/core/css/FontFaceCache.h
+++ b/Source/core/css/FontFaceCache.h
@@ -27,6 +27,7 @@
 #ifndef FontFaceCache_h
 #define FontFaceCache_h
 
+#include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 #include "wtf/ListHashSet.h"
@@ -40,7 +41,7 @@ class CSSSegmentedFontFace;
 class FontDescription;
 class StyleRuleFontFace;
 
-class FontFaceCache {
+class FontFaceCache : NoBaseWillBeGarbageCollectedFinalized<FontFaceCache> {

[sof, 2014/04/07 13:37:59]

A FINAL would be in order here?

[wibling-chromium, 2014/04/08 09:35:59]

Done.

 public:
     FontFaceCache();
 
@@ -60,9 +61,11 @@ public:
 
     unsigned version() const { return m_version; }
 
+    void trace(Visitor*);
+
 private:
-    typedef HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > TraitsMap;
-    typedef HashMap<String, OwnPtr<TraitsMap>, CaseFoldingHash> FamilyToTraitsMap;
+    typedef WillBeHeapHashMap<unsigned, RefPtrWillBeMember<CSSSegmentedFontFace> > TraitsMap;
+    typedef WillBeHeapHashMap<String, OwnPtrWillBeMember<TraitsMap>, CaseFoldingHash> FamilyToTraitsMap;
     typedef HashMap<const StyleRuleFontFace*, RefPtr<FontFace> > StyleRuleToFontFace;
     FamilyToTraitsMap m_fontFaces;
     FamilyToTraitsMap m_fonts;