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

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

Issue 137253005: [Font Load Events] Partial implementation of SetClass operations for FontFaceSet (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix callback arguments Created 6 years, 11 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
« no previous file with comments | « Source/core/css/CSSFontSelector.cpp ('k') | Source/core/css/CSSSegmentedFontFaceCache.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 11 matching lines...) Expand all
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #ifndef CSSSegmentedFontFaceCache_h 27 #ifndef CSSSegmentedFontFaceCache_h
28 #define CSSSegmentedFontFaceCache_h 28 #define CSSSegmentedFontFaceCache_h
29 29
30 #include "wtf/Forward.h" 30 #include "wtf/Forward.h"
31 #include "wtf/HashMap.h" 31 #include "wtf/HashMap.h"
32 #include "wtf/ListHashSet.h"
32 #include "wtf/text/StringHash.h" 33 #include "wtf/text/StringHash.h"
33 34
34 namespace WebCore { 35 namespace WebCore {
35 36
36 class CSSFontFace; 37 class CSSFontFace;
37 class CSSFontSelector; 38 class CSSFontSelector;
38 class CSSSegmentedFontFace; 39 class CSSSegmentedFontFace;
39 class FontDescription; 40 class FontDescription;
40 class StyleRuleFontFace; 41 class StyleRuleFontFace;
41 42
42 class CSSSegmentedFontFaceCache { 43 class CSSSegmentedFontFaceCache {
43 public: 44 public:
44 CSSSegmentedFontFaceCache(); 45 CSSSegmentedFontFaceCache();
45 46
46 // FIXME: Remove CSSFontSelector as argument. Passing CSSFontSelector here i s 47 // FIXME: Remove CSSFontSelector as argument. Passing CSSFontSelector here i s
47 // a result of egregious spaghettification in CSSFontFace/FontFaceSet. 48 // a result of egregious spaghettification in CSSFontFace/FontFaceSet.
48 void add(CSSFontSelector*, const StyleRuleFontFace*, PassRefPtr<CSSFontFace> ); 49 void add(CSSFontSelector*, const StyleRuleFontFace*, PassRefPtr<CSSFontFace> );
49 void remove(const StyleRuleFontFace*); 50 void remove(const StyleRuleFontFace*);
51
50 // FIXME: It's sort of weird that add/remove uses StyleRuleFontFace* as key, 52 // FIXME: It's sort of weird that add/remove uses StyleRuleFontFace* as key,
51 // but this function uses FontDescription/family pair. 53 // but this function uses FontDescription/family pair.
52 CSSSegmentedFontFace* get(const FontDescription&, const AtomicString& family ); 54 CSSSegmentedFontFace* get(const FontDescription&, const AtomicString& family );
53 55
56 const ListHashSet<RefPtr<CSSFontFace> >& cssFontFaceList() const { return m_ fontFaceList; }
57
54 unsigned version() const { return m_version; } 58 unsigned version() const { return m_version; }
55 59
56 private: 60 private:
57 typedef HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > TraitsMap; 61 typedef HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > TraitsMap;
58 typedef HashMap<String, OwnPtr<TraitsMap>, CaseFoldingHash> FamilyToTraitsMa p; 62 typedef HashMap<String, OwnPtr<TraitsMap>, CaseFoldingHash> FamilyToTraitsMa p;
59 typedef HashMap<const StyleRuleFontFace*, RefPtr<CSSFontFace> > StyleRuleToF ontFace; 63 typedef HashMap<const StyleRuleFontFace*, RefPtr<CSSFontFace> > StyleRuleToF ontFace;
60 FamilyToTraitsMap m_fontFaces; 64 FamilyToTraitsMap m_fontFaces;
61 FamilyToTraitsMap m_fonts; 65 FamilyToTraitsMap m_fonts;
62 StyleRuleToFontFace m_styleRuleToFontFace; 66 StyleRuleToFontFace m_styleRuleToFontFace;
67 ListHashSet<RefPtr<CSSFontFace> > m_fontFaceList;
63 68
64 // FIXME: See if this could be ditched 69 // FIXME: See if this could be ditched
65 // Used to compare Font instances, and the usage seems suspect. 70 // Used to compare Font instances, and the usage seems suspect.
66 unsigned m_version; 71 unsigned m_version;
67 }; 72 };
68 73
69 } 74 }
70 75
71 #endif 76 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSFontSelector.cpp ('k') | Source/core/css/CSSSegmentedFontFaceCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698