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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSFontFace.h

Issue 1729013002: blink: Rename enums and functions to not collide with chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-3: . Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 bool contains(UChar32) const; 101 bool contains(UChar32) const;
102 bool contains(const FontDataRange&) const; 102 bool contains(const FontDataRange&) const;
103 bool intersectsWith(const String&) const; 103 bool intersectsWith(const String&) const;
104 bool isEntireRange() const { return m_ranges.isEmpty(); } 104 bool isEntireRange() const { return m_ranges.isEmpty(); }
105 size_t size() const { return m_ranges.size(); } 105 size_t size() const { return m_ranges.size(); }
106 const UnicodeRange& rangeAt(size_t i) const { return m_ranges[i]; } 106 const UnicodeRange& rangeAt(size_t i) const { return m_ranges[i]; }
107 private: 107 private:
108 Vector<UnicodeRange> m_ranges; // If empty, represents the whole code sp ace. 108 Vector<UnicodeRange> m_ranges; // If empty, represents the whole code sp ace.
109 }; 109 };
110 110
111 FontFace::LoadStatus loadStatus() const { return m_fontFace->loadStatus(); } 111 FontFace::LoadStatusType loadStatus() const { return m_fontFace->loadStatus( ); }
112 bool maybeScheduleFontLoad(const FontDescription&, UChar32); 112 bool maybeScheduleFontLoad(const FontDescription&, UChar32);
113 bool maybeScheduleFontLoad(const FontDescription&, const FontDataRange&); 113 bool maybeScheduleFontLoad(const FontDescription&, const FontDataRange&);
114 void load(); 114 void load();
115 void load(const FontDescription&); 115 void load(const FontDescription&);
116 116
117 bool hadBlankText() { return isValid() && m_sources.first()->hadBlankText(); } 117 bool hadBlankText() { return isValid() && m_sources.first()->hadBlankText(); }
118 118
119 DECLARE_TRACE(); 119 DECLARE_TRACE();
120 120
121 private: 121 private:
122 void setLoadStatus(FontFace::LoadStatus); 122 void setLoadStatus(FontFace::LoadStatusType);
123 123
124 UnicodeRangeSet m_ranges; 124 UnicodeRangeSet m_ranges;
125 RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace; 125 RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace;
126 WillBeHeapDeque<OwnPtrWillBeMember<CSSFontFaceSource>> m_sources; 126 WillBeHeapDeque<OwnPtrWillBeMember<CSSFontFaceSource>> m_sources;
127 RawPtrWillBeMember<FontFace> m_fontFace; 127 RawPtrWillBeMember<FontFace> m_fontFace;
128 }; 128 };
129 129
130 } // namespace blink 130 } // namespace blink
131 131
132 #endif 132 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698