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

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

Issue 1419883005: Remove unused m_src from FontFace class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | third_party/WebKit/Source/core/css/FontFace.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) 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(const CSSValue&); 128 bool setFamilyValue(const CSSValue&);
129 void loadInternal(ExecutionContext*); 129 void loadInternal(ExecutionContext*);
130 ScriptPromise fontStatusPromise(ScriptState*); 130 ScriptPromise fontStatusPromise(ScriptState*);
131 131
132 using LoadedProperty = ScriptPromiseProperty<RawPtrWillBeMember<FontFace>, R awPtrWillBeMember<FontFace>, Member<DOMException>>; 132 using LoadedProperty = ScriptPromiseProperty<RawPtrWillBeMember<FontFace>, R awPtrWillBeMember<FontFace>, Member<DOMException>>;
133 133
134 AtomicString m_family; 134 AtomicString m_family;
135 String m_otsParseMessage; 135 String m_otsParseMessage;
136 RefPtrWillBeMember<CSSValue> m_src;
137 RefPtrWillBeMember<CSSValue> m_style; 136 RefPtrWillBeMember<CSSValue> m_style;
138 RefPtrWillBeMember<CSSValue> m_weight; 137 RefPtrWillBeMember<CSSValue> m_weight;
139 RefPtrWillBeMember<CSSValue> m_stretch; 138 RefPtrWillBeMember<CSSValue> m_stretch;
140 RefPtrWillBeMember<CSSValue> m_unicodeRange; 139 RefPtrWillBeMember<CSSValue> m_unicodeRange;
141 RefPtrWillBeMember<CSSValue> m_variant; 140 RefPtrWillBeMember<CSSValue> m_variant;
142 RefPtrWillBeMember<CSSValue> m_featureSettings; 141 RefPtrWillBeMember<CSSValue> m_featureSettings;
143 LoadStatus m_status; 142 LoadStatus m_status;
144 PersistentWillBeMember<DOMException> m_error; 143 PersistentWillBeMember<DOMException> m_error;
145 144
146 PersistentWillBeMember<LoadedProperty> m_loadedProperty; 145 PersistentWillBeMember<LoadedProperty> m_loadedProperty;
147 OwnPtrWillBeMember<CSSFontFace> m_cssFontFace; 146 OwnPtrWillBeMember<CSSFontFace> m_cssFontFace;
148 WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback>> m_callbacks; 147 WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback>> m_callbacks;
149 }; 148 };
150 149
151 using FontFaceArray = WillBeHeapVector<RefPtrWillBeMember<FontFace>>; 150 using FontFaceArray = WillBeHeapVector<RefPtrWillBeMember<FontFace>>;
152 151
153 } // namespace blink 152 } // namespace blink
154 153
155 #endif // FontFace_h 154 #endif // FontFace_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/FontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698