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

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

Issue 989173003: Fix template angle bracket syntax in css (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « Source/core/css/CSSRuleList.h ('k') | Source/core/css/CSSSegmentedFontFace.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) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 void fontLoaded(CSSFontFace*); 58 void fontLoaded(CSSFontFace*);
59 void fontLoadWaitLimitExceeded(CSSFontFace*); 59 void fontLoadWaitLimitExceeded(CSSFontFace*);
60 60
61 void addFontFace(PassRefPtrWillBeRawPtr<FontFace>, bool cssConnected); 61 void addFontFace(PassRefPtrWillBeRawPtr<FontFace>, bool cssConnected);
62 void removeFontFace(PassRefPtrWillBeRawPtr<FontFace>); 62 void removeFontFace(PassRefPtrWillBeRawPtr<FontFace>);
63 bool isEmpty() const { return m_fontFaces.isEmpty(); } 63 bool isEmpty() const { return m_fontFaces.isEmpty(); }
64 64
65 PassRefPtr<FontData> getFontData(const FontDescription&); 65 PassRefPtr<FontData> getFontData(const FontDescription&);
66 66
67 bool checkFont(const String&) const; 67 bool checkFont(const String&) const;
68 void match(const String&, WillBeHeapVector<RefPtrWillBeMember<FontFace> >&) const; 68 void match(const String&, WillBeHeapVector<RefPtrWillBeMember<FontFace>>&) c onst;
69 void willUseFontData(const FontDescription&, UChar32); 69 void willUseFontData(const FontDescription&, UChar32);
70 70
71 DECLARE_TRACE(); 71 DECLARE_TRACE();
72 72
73 private: 73 private:
74 CSSSegmentedFontFace(CSSFontSelector*, FontTraits); 74 CSSSegmentedFontFace(CSSFontSelector*, FontTraits);
75 75
76 void pruneTable(); 76 void pruneTable();
77 bool isValid() const; 77 bool isValid() const;
78 78
79 typedef WillBeHeapListHashSet<RefPtrWillBeMember<FontFace> > FontFaceList; 79 typedef WillBeHeapListHashSet<RefPtrWillBeMember<FontFace>> FontFaceList;
80 80
81 RawPtrWillBeMember<CSSFontSelector> m_fontSelector; 81 RawPtrWillBeMember<CSSFontSelector> m_fontSelector;
82 FontTraits m_traits; 82 FontTraits m_traits;
83 HashMap<unsigned, RefPtr<SegmentedFontData> > m_fontDataTable; 83 HashMap<unsigned, RefPtr<SegmentedFontData>> m_fontDataTable;
84 // All non-CSS-connected FontFaces are stored after the CSS-connected ones. 84 // All non-CSS-connected FontFaces are stored after the CSS-connected ones.
85 FontFaceList m_fontFaces; 85 FontFaceList m_fontFaces;
86 FontFaceList::iterator m_firstNonCssConnectedFace; 86 FontFaceList::iterator m_firstNonCssConnectedFace;
87 }; 87 };
88 88
89 } // namespace blink 89 } // namespace blink
90 90
91 #endif // CSSSegmentedFontFace_h 91 #endif // CSSSegmentedFontFace_h
OLDNEW
« no previous file with comments | « Source/core/css/CSSRuleList.h ('k') | Source/core/css/CSSSegmentedFontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698