Source/core/css/CSSFontSelector.h - Issue 18856015: [oilpan] Move CSSFontFace to the managed heap

Side by Side Diff: Source/core/css/CSSFontSelector.h

Issue 18856015: [oilpan] Move CSSFontFace 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.	2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 65 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76 void beginLoadingFontSoon(CachedFont*);	76 void beginLoadingFontSoon(CachedFont*);

77	77

78 private:	78 private:

79 CSSFontSelector(Document*);	79 CSSFontSelector(Document*);

80	80

81 void dispatchInvalidationCallbacks();	81 void dispatchInvalidationCallbacks();

82	82

83 void beginLoadTimerFired(Timer<CSSFontSelector>*);	83 void beginLoadTimerFired(Timer<CSSFontSelector>*);

84	84

85 Document* m_document;	85 Document* m_document;

86 HashMap<String, OwnPtr<Vector<RefPtr<CSSFontFace> > >, WTF::FastAllocator, C aseFoldingHash> m_fontFaces;	86 // FIXME(oilpan): Move CSSFontSelector to the managed heap and remove Collec tionRoot and Persistent.

87 HashMap<String, OwnPtr<Vector<RefPtr<CSSFontFace> > >, WTF::FastAllocator, C aseFoldingHash> m_locallyInstalledFontFaces;	87 typedef CollectionRoot<Vector<Member<CSSFontFace> > > CSSFontFaceVectorColle ction;

88 // FIXME(oilpan): Implement a weak hashmap on the managed heap.	88 HashMap<String, OwnPtr<CSSFontFaceVectorCollection>, WTF::FastAllocator, Cas eFoldingHash> m_fontFaces;

	89 HashMap<String, OwnPtr<CSSFontFaceVectorCollection>, WTF::FastAllocator, Cas eFoldingHash> m_locallyInstalledFontFaces;

89 typedef HashMap<unsigned, Persistent<CSSSegmentedFontFace> > SegmentedFontFa ceHashMap;	90 typedef HashMap<unsigned, Persistent<CSSSegmentedFontFace> > SegmentedFontFa ceHashMap;

90 HashMap<String, OwnPtr<SegmentedFontFaceHashMap>, WTF::FastAllocator, CaseFo ldingHash> m_fonts;	91 HashMap<String, OwnPtr<SegmentedFontFaceHashMap>, WTF::FastAllocator, CaseFo ldingHash> m_fonts;

91 HashSet<FontSelectorClient*> m_clients;	92 HashSet<FontSelectorClient*> m_clients;

92	93

93 Vector<CachedResourceHandle<CachedFont> > m_fontsToBeginLoading;	94 Vector<CachedResourceHandle<CachedFont> > m_fontsToBeginLoading;

94 Timer<CSSFontSelector> m_beginLoadingTimer;	95 Timer<CSSFontSelector> m_beginLoadingTimer;

95	96

96 unsigned m_version;	97 unsigned m_version;

97 };	98 };

98	99

99 } // namespace WebCore	100 } // namespace WebCore

100	101

101 #endif // CSSFontSelector_h	102 #endif // CSSFontSelector_h

OLD	NEW

« Source/core/css/CSSFontFaceSource.h ('K') | « Source/core/css/CSSFontFaceSource.h ('k') | Source/core/css/CSSFontSelector.cpp » ('j') | Source/heap/Visitor.h » ('J')