Index: Source/core/css/CSSFontSelector.h |
diff --git a/Source/core/css/CSSFontSelector.h b/Source/core/css/CSSFontSelector.h |
index 4288afe8bca4dde4bcd43ecf42f5473b3d9db96e..9fa17c890fce9c82c94d6171c21e705cc8226cef 100644 |
--- a/Source/core/css/CSSFontSelector.h |
+++ b/Source/core/css/CSSFontSelector.h |
@@ -83,9 +83,10 @@ private: |
void beginLoadTimerFired(Timer<CSSFontSelector>*); |
Document* m_document; |
- HashMap<String, OwnPtr<Vector<RefPtr<CSSFontFace> > >, WTF::FastAllocator, CaseFoldingHash> m_fontFaces; |
- HashMap<String, OwnPtr<Vector<RefPtr<CSSFontFace> > >, WTF::FastAllocator, CaseFoldingHash> m_locallyInstalledFontFaces; |
- // FIXME(oilpan): Implement a weak hashmap on the managed heap. |
+ // FIXME(oilpan): Move CSSFontSelector to the managed heap and remove CollectionRoot and Persistent. |
+ typedef CollectionRoot<Vector<Member<CSSFontFace> > > CSSFontFaceVectorCollection; |
+ HashMap<String, OwnPtr<CSSFontFaceVectorCollection>, WTF::FastAllocator, CaseFoldingHash> m_fontFaces; |
+ HashMap<String, OwnPtr<CSSFontFaceVectorCollection>, WTF::FastAllocator, CaseFoldingHash> m_locallyInstalledFontFaces; |
typedef HashMap<unsigned, Persistent<CSSSegmentedFontFace> > SegmentedFontFaceHashMap; |
HashMap<String, OwnPtr<SegmentedFontFaceHashMap>, WTF::FastAllocator, CaseFoldingHash> m_fonts; |
HashSet<FontSelectorClient*> m_clients; |