Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(543)

Unified Diff: Source/core/css/CSSFontSelector.h

Issue 18882002: [oilpan] Move CSSSegmentedFontFace to the managed heap (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/CSSFontFace.cpp ('k') | Source/core/css/CSSFontSelector.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
zerny-google 2013/07/09 13:09:09 I think this should just be a strong manp of membe
+ HashMap<String, OwnPtr<SegmentedFontFaceHashMap>, WTF::FastAllocator, CaseFoldingHash> m_fonts;
HashSet<FontSelectorClient*> m_clients;
Vector<CachedResourceHandle<CachedFont> > m_fontsToBeginLoading;
« no previous file with comments | « Source/core/css/CSSFontFace.cpp ('k') | Source/core/css/CSSFontSelector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698