| Index: Source/core/css/CSSFontSelector.h
|
| diff --git a/Source/core/css/CSSFontSelector.h b/Source/core/css/CSSFontSelector.h
|
| index d482571eb1c9819879d1572255b74281b161f4a6..40e1cc6a5eb14fed53f948db7518048fe1f0c93d 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();
|
|
|
| @@ -83,9 +83,11 @@ 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;
|
| - HashMap<String, OwnPtr<HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > >, WTF::FastAllocator, CaseFoldingHash> m_fonts;
|
| + typedef CollectionRoot<Vector<Member<CSSFontFace> > > CSSFontFaceVectorCollection;
|
| + HashMap<String, OwnPtr<CSSFontFaceVectorCollection>, WTF::FastAllocator, CaseFoldingHash> m_fontFaces;
|
| + HashMap<String, OwnPtr<CSSFontFaceVectorCollection>, WTF::FastAllocator, CaseFoldingHash> m_locallyInstalledFontFaces;
|
| + // FIXME(oilpan): Implement a weak hashmap on the managed heap.
|
| + HashMap<String, OwnPtr<HashMap<unsigned, Persistent<CSSSegmentedFontFace> > >, WTF::FastAllocator, CaseFoldingHash> m_fonts;
|
| HashSet<FontSelectorClient*> m_clients;
|
|
|
| Vector<CachedResourceHandle<CachedFont> > m_fontsToBeginLoading;
|
|
|