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

Side by Side Diff: sky/engine/core/css/FontFaceCache.h

Issue 723253004: Remove tons of OILPAN. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « sky/engine/core/css/ElementRuleCollector.h ('k') | sky/engine/core/css/FontFaceCache.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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 // FIXME: It's sort of weird that add/remove uses StyleRuleFontFace* as key, 58 // FIXME: It's sort of weird that add/remove uses StyleRuleFontFace* as key,
59 // but this function uses FontDescription/family pair. 59 // but this function uses FontDescription/family pair.
60 CSSSegmentedFontFace* get(const FontDescription&, const AtomicString& family ); 60 CSSSegmentedFontFace* get(const FontDescription&, const AtomicString& family );
61 61
62 const ListHashSet<RefPtr<FontFace> >& cssConnectedFontFaces() const { return m_cssConnectedFontFaces; } 62 const ListHashSet<RefPtr<FontFace> >& cssConnectedFontFaces() const { return m_cssConnectedFontFaces; }
63 63
64 unsigned version() const { return m_version; } 64 unsigned version() const { return m_version; }
65 void incrementVersion() { ++m_version; } 65 void incrementVersion() { ++m_version; }
66 66
67 void trace(Visitor*);
68
69 private: 67 private:
70 typedef HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > TraitsMap; 68 typedef HashMap<unsigned, RefPtr<CSSSegmentedFontFace> > TraitsMap;
71 typedef HashMap<String, OwnPtr<TraitsMap>, CaseFoldingHash> FamilyToTraitsMa p; 69 typedef HashMap<String, OwnPtr<TraitsMap>, CaseFoldingHash> FamilyToTraitsMa p;
72 typedef HashMap<const StyleRuleFontFace*, RefPtr<FontFace> > StyleRuleToFont Face; 70 typedef HashMap<const StyleRuleFontFace*, RefPtr<FontFace> > StyleRuleToFont Face;
73 FamilyToTraitsMap m_fontFaces; 71 FamilyToTraitsMap m_fontFaces;
74 FamilyToTraitsMap m_fonts; 72 FamilyToTraitsMap m_fonts;
75 StyleRuleToFontFace m_styleRuleToFontFace; 73 StyleRuleToFontFace m_styleRuleToFontFace;
76 ListHashSet<RefPtr<FontFace> > m_cssConnectedFontFaces; 74 ListHashSet<RefPtr<FontFace> > m_cssConnectedFontFaces;
77 75
78 // FIXME: See if this could be ditched 76 // FIXME: See if this could be ditched
79 // Used to compare Font instances, and the usage seems suspect. 77 // Used to compare Font instances, and the usage seems suspect.
80 unsigned m_version; 78 unsigned m_version;
81 }; 79 };
82 80
83 } 81 }
84 82
85 #endif 83 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/css/ElementRuleCollector.h ('k') | sky/engine/core/css/FontFaceCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698