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

Side by Side Diff: third_party/WebKit/Source/core/css/FontFace.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) 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 class ExceptionState; 53 class ExceptionState;
54 class FontFaceDescriptors; 54 class FontFaceDescriptors;
55 class StringOrArrayBufferOrArrayBufferView; 55 class StringOrArrayBufferOrArrayBufferView;
56 class StylePropertySet; 56 class StylePropertySet;
57 class StyleRuleFontFace; 57 class StyleRuleFontFace;
58 58
59 class FontFace : public RefCountedWillBeGarbageCollectedFinalized<FontFace>, pub lic ScriptWrappable, public ActiveDOMObject { 59 class FontFace : public RefCountedWillBeGarbageCollectedFinalized<FontFace>, pub lic ScriptWrappable, public ActiveDOMObject {
60 DEFINE_WRAPPERTYPEINFO(); 60 DEFINE_WRAPPERTYPEINFO();
61 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FontFace); 61 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FontFace);
62 public: 62 public:
63 enum LoadStatus { Unloaded, Loading, Loaded, Error }; 63 enum LoadStatusType { Unloaded, Loading, Loaded, Error };
64 64
65 static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const Atom icString& family, StringOrArrayBufferOrArrayBufferView&, const FontFaceDescripto rs&); 65 static PassRefPtrWillBeRawPtr<FontFace> create(ExecutionContext*, const Atom icString& family, StringOrArrayBufferOrArrayBufferView&, const FontFaceDescripto rs&);
66 static PassRefPtrWillBeRawPtr<FontFace> create(Document*, const StyleRuleFon tFace*); 66 static PassRefPtrWillBeRawPtr<FontFace> create(Document*, const StyleRuleFon tFace*);
67 67
68 ~FontFace(); 68 ~FontFace();
69 69
70 const AtomicString& family() const { return m_family; } 70 const AtomicString& family() const { return m_family; }
71 String style() const; 71 String style() const;
72 String weight() const; 72 String weight() const;
73 String stretch() const; 73 String stretch() const;
74 String unicodeRange() const; 74 String unicodeRange() const;
75 String variant() const; 75 String variant() const;
76 String featureSettings() const; 76 String featureSettings() const;
77 77
78 // FIXME: Changing these attributes should affect font matching. 78 // FIXME: Changing these attributes should affect font matching.
79 void setFamily(ExecutionContext*, const AtomicString& s, ExceptionState&) { m_family = s; } 79 void setFamily(ExecutionContext*, const AtomicString& s, ExceptionState&) { m_family = s; }
80 void setStyle(ExecutionContext*, const String&, ExceptionState&); 80 void setStyle(ExecutionContext*, const String&, ExceptionState&);
81 void setWeight(ExecutionContext*, const String&, ExceptionState&); 81 void setWeight(ExecutionContext*, const String&, ExceptionState&);
82 void setStretch(ExecutionContext*, const String&, ExceptionState&); 82 void setStretch(ExecutionContext*, const String&, ExceptionState&);
83 void setUnicodeRange(ExecutionContext*, const String&, ExceptionState&); 83 void setUnicodeRange(ExecutionContext*, const String&, ExceptionState&);
84 void setVariant(ExecutionContext*, const String&, ExceptionState&); 84 void setVariant(ExecutionContext*, const String&, ExceptionState&);
85 void setFeatureSettings(ExecutionContext*, const String&, ExceptionState&); 85 void setFeatureSettings(ExecutionContext*, const String&, ExceptionState&);
86 86
87 String status() const; 87 String status() const;
88 ScriptPromise loaded(ScriptState* scriptState) { return fontStatusPromise(sc riptState); } 88 ScriptPromise loaded(ScriptState* scriptState) { return fontStatusPromise(sc riptState); }
89 89
90 ScriptPromise load(ScriptState*); 90 ScriptPromise load(ScriptState*);
91 91
92 LoadStatus loadStatus() const { return m_status; } 92 LoadStatusType loadStatus() const { return m_status; }
93 void setLoadStatus(LoadStatus); 93 void setLoadStatus(LoadStatusType);
94 void setError(DOMException* = nullptr); 94 void setError(DOMException* = nullptr);
95 DOMException* error() const { return m_error; } 95 DOMException* error() const { return m_error; }
96 FontTraits traits() const; 96 FontTraits traits() const;
97 CSSFontFace* cssFontFace() { return m_cssFontFace.get(); } 97 CSSFontFace* cssFontFace() { return m_cssFontFace.get(); }
98 98
99 DECLARE_VIRTUAL_TRACE(); 99 DECLARE_VIRTUAL_TRACE();
100 100
101 bool hadBlankText() const; 101 bool hadBlankText() const;
102 102
103 class LoadFontCallback : public RefCountedWillBeGarbageCollectedFinalized<Lo adFontCallback> { 103 class LoadFontCallback : public RefCountedWillBeGarbageCollectedFinalized<Lo adFontCallback> {
(...skipping 29 matching lines...) Expand all
133 133
134 AtomicString m_family; 134 AtomicString m_family;
135 String m_otsParseMessage; 135 String m_otsParseMessage;
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 RefPtrWillBeMember<CSSValue> m_display; 142 RefPtrWillBeMember<CSSValue> m_display;
143 LoadStatus m_status; 143 LoadStatusType m_status;
144 PersistentWillBeMember<DOMException> m_error; 144 PersistentWillBeMember<DOMException> m_error;
145 145
146 PersistentWillBeMember<LoadedProperty> m_loadedProperty; 146 PersistentWillBeMember<LoadedProperty> m_loadedProperty;
147 OwnPtrWillBeMember<CSSFontFace> m_cssFontFace; 147 OwnPtrWillBeMember<CSSFontFace> m_cssFontFace;
148 WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback>> m_callbacks; 148 WillBeHeapVector<RefPtrWillBeMember<LoadFontCallback>> m_callbacks;
149 }; 149 };
150 150
151 using FontFaceArray = WillBeHeapVector<RefPtrWillBeMember<FontFace>>; 151 using FontFaceArray = WillBeHeapVector<RefPtrWillBeMember<FontFace>>;
152 152
153 } // namespace blink 153 } // namespace blink
154 154
155 #endif // FontFace_h 155 #endif // FontFace_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/ElementRuleCollector.cpp ('k') | third_party/WebKit/Source/core/css/FontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698