Index: Source/core/css/CSSFontSelector.h |
diff --git a/Source/core/css/CSSFontSelector.h b/Source/core/css/CSSFontSelector.h |
index d482571eb1c9819879d1572255b74281b161f4a6..4288afe8bca4dde4bcd43ecf42f5473b3d9db96e 100644 |
--- a/Source/core/css/CSSFontSelector.h |
+++ b/Source/core/css/CSSFontSelector.h |
@@ -57,7 +57,7 @@ public: |
virtual unsigned version() const OVERRIDE { return m_version; } |
virtual PassRefPtr<FontData> getFontData(const FontDescription&, const AtomicString&); |
- CSSSegmentedFontFace* getFontFace(const FontDescription&, const AtomicString& family); |
+ Result<CSSSegmentedFontFace> getFontFace(const FontDescription&, const AtomicString& family); |
void clearDocument(); |
@@ -85,7 +85,9 @@ private: |
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; |
- HashMap<String, OwnPtr<HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > >, WTF::FastAllocator, CaseFoldingHash> m_fonts; |
+ // FIXME(oilpan): Implement a weak hashmap on the managed heap. |
+ typedef HashMap<unsigned, Persistent<CSSSegmentedFontFace> > SegmentedFontFaceHashMap; |
+ HashMap<String, OwnPtr<SegmentedFontFaceHashMap>, WTF::FastAllocator, CaseFoldingHash> m_fonts; |
HashSet<FontSelectorClient*> m_clients; |
Vector<CachedResourceHandle<CachedFont> > m_fontsToBeginLoading; |