Source/core/css/FontFace.h - Issue 989173003: Fix template angle bracket syntax in css

Side by Side Diff: Source/core/css/FontFace.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/ElementRuleCollector.h ('k') | Source/core/css/FontFace.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Google Inc. All rights reserved.	2 * Copyright (C) 2013 Google 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 are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * 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 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 111 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
122	122

123 void initCSSFontFace(Document*, PassRefPtrWillBeRawPtr<CSSValue> src);	123 void initCSSFontFace(Document*, PassRefPtrWillBeRawPtr<CSSValue> src);

124 void initCSSFontFace(const unsigned char* data, unsigned size);	124 void initCSSFontFace(const unsigned char* data, unsigned size);

125 void setPropertyFromString(const Document, const String&, CSSPropertyID, Ex ceptionState = 0);	125 void setPropertyFromString(const Document, const String&, CSSPropertyID, Ex ceptionState = 0);

126 bool setPropertyFromStyle(const StylePropertySet&, CSSPropertyID);	126 bool setPropertyFromStyle(const StylePropertySet&, CSSPropertyID);

127 bool setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue>, CSSPropertyID);	127 bool setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue>, CSSPropertyID);

128 bool setFamilyValue(CSSValueList*);	128 bool setFamilyValue(CSSValueList*);

129 void loadInternal(ExecutionContext*);	129 void loadInternal(ExecutionContext*);

130 ScriptPromise fontStatusPromise(ScriptState*);	130 ScriptPromise fontStatusPromise(ScriptState*);

131	131

132 typedef ScriptPromiseProperty<RawPtrWillBeMember<FontFace>, RawPtrWillBeMemb er<FontFace>, RefPtrWillBeMember<DOMException> > LoadedProperty;	132 typedef ScriptPromiseProperty<RawPtrWillBeMember<FontFace>, RawPtrWillBeMemb er<FontFace>, RefPtrWillBeMember<DOMException>> LoadedProperty;

133	133

134 AtomicString m_family;	134 AtomicString m_family;

135 RefPtrWillBeMember<CSSValue> m_src;	135 RefPtrWillBeMember<CSSValue> m_src;

136 RefPtrWillBeMember<CSSValue> m_style;	136 RefPtrWillBeMember<CSSValue> m_style;

137 RefPtrWillBeMember<CSSValue> m_weight;	137 RefPtrWillBeMember<CSSValue> m_weight;

138 RefPtrWillBeMember<CSSValue> m_stretch;	138 RefPtrWillBeMember<CSSValue> m_stretch;

139 RefPtrWillBeMember<CSSValue> m_unicodeRange;	139 RefPtrWillBeMember<CSSValue> m_unicodeRange;

140 RefPtrWillBeMember<CSSValue> m_variant;	140 RefPtrWillBeMember<CSSValue> m_variant;

141 RefPtrWillBeMember<CSSValue> m_featureSettings;	141 RefPtrWillBeMember<CSSValue> m_featureSettings;

142 LoadStatus m_status;	142 LoadStatus m_status;

143 RefPtrWillBeMember<DOMException> m_error;	143 RefPtrWillBeMember<DOMException> m_error;

144	144

145 PersistentWillBeMember<LoadedProperty> m_loadedProperty;	145 PersistentWillBeMember<LoadedProperty> m_loadedProperty;

146 OwnPtrWillBeMember<CSSFontFace> m_cssFontFace;	146 OwnPtrWillBeMember<CSSFontFace> m_cssFontFace;

147 WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback> > m_callbacks;	147 WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback>> m_callbacks;

148 };	148 };

149	149

150 typedef WillBeHeapVector<RefPtrWillBeMember<FontFace> > FontFaceArray;	150 typedef WillBeHeapVector<RefPtrWillBeMember<FontFace>> FontFaceArray;

151	151

152 } // namespace blink	152 } // namespace blink

153	153

154 #endif // FontFace_h	154 #endif // FontFace_h

OLD	NEW