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

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

Issue 2640753002: CSS font-display: expose display property on FontFace (Closed)
Patch Set: Fix webexposed Created 3 years, 11 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 virtual ~FontFace(); 76 virtual ~FontFace();
77 77
78 const AtomicString& family() const { return m_family; } 78 const AtomicString& family() const { return m_family; }
79 String style() const; 79 String style() const;
80 String weight() const; 80 String weight() const;
81 String stretch() const; 81 String stretch() const;
82 String unicodeRange() const; 82 String unicodeRange() const;
83 String variant() const; 83 String variant() const;
84 String featureSettings() const; 84 String featureSettings() const;
85 String display() const;
85 86
86 // FIXME: Changing these attributes should affect font matching. 87 // FIXME: Changing these attributes should affect font matching.
87 void setFamily(ExecutionContext*, const AtomicString& s, ExceptionState&) { 88 void setFamily(ExecutionContext*, const AtomicString& s, ExceptionState&) {
88 m_family = s; 89 m_family = s;
89 } 90 }
90 void setStyle(ExecutionContext*, const String&, ExceptionState&); 91 void setStyle(ExecutionContext*, const String&, ExceptionState&);
91 void setWeight(ExecutionContext*, const String&, ExceptionState&); 92 void setWeight(ExecutionContext*, const String&, ExceptionState&);
92 void setStretch(ExecutionContext*, const String&, ExceptionState&); 93 void setStretch(ExecutionContext*, const String&, ExceptionState&);
93 void setUnicodeRange(ExecutionContext*, const String&, ExceptionState&); 94 void setUnicodeRange(ExecutionContext*, const String&, ExceptionState&);
94 void setVariant(ExecutionContext*, const String&, ExceptionState&); 95 void setVariant(ExecutionContext*, const String&, ExceptionState&);
95 void setFeatureSettings(ExecutionContext*, const String&, ExceptionState&); 96 void setFeatureSettings(ExecutionContext*, const String&, ExceptionState&);
97 void setDisplay(ExecutionContext*, const String&, ExceptionState&);
96 98
97 String status() const; 99 String status() const;
98 ScriptPromise loaded(ScriptState* scriptState) { 100 ScriptPromise loaded(ScriptState* scriptState) {
99 return fontStatusPromise(scriptState); 101 return fontStatusPromise(scriptState);
100 } 102 }
101 103
102 ScriptPromise load(ScriptState*); 104 ScriptPromise load(ScriptState*);
103 105
104 LoadStatusType loadStatus() const { return m_status; } 106 LoadStatusType loadStatus() const { return m_status; }
105 void setLoadStatus(LoadStatusType); 107 void setLoadStatus(LoadStatusType);
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 Member<LoadedProperty> m_loadedProperty; 179 Member<LoadedProperty> m_loadedProperty;
178 Member<CSSFontFace> m_cssFontFace; 180 Member<CSSFontFace> m_cssFontFace;
179 HeapVector<Member<LoadFontCallback>> m_callbacks; 181 HeapVector<Member<LoadFontCallback>> m_callbacks;
180 }; 182 };
181 183
182 using FontFaceArray = HeapVector<Member<FontFace>>; 184 using FontFaceArray = HeapVector<Member<FontFace>>;
183 185
184 } // namespace blink 186 } // namespace blink
185 187
186 #endif // FontFace_h 188 #endif // FontFace_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698