| 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 void setFamily(ExecutionContext*, const AtomicString& s, ExceptionState&) {
m_family = s; } | 74 void setFamily(ExecutionContext*, const AtomicString& s, ExceptionState&) {
m_family = s; } |
| 75 void setStyle(ExecutionContext*, const String&, ExceptionState&); | 75 void setStyle(ExecutionContext*, const String&, ExceptionState&); |
| 76 void setWeight(ExecutionContext*, const String&, ExceptionState&); | 76 void setWeight(ExecutionContext*, const String&, ExceptionState&); |
| 77 void setStretch(ExecutionContext*, const String&, ExceptionState&); | 77 void setStretch(ExecutionContext*, const String&, ExceptionState&); |
| 78 void setUnicodeRange(ExecutionContext*, const String&, ExceptionState&); | 78 void setUnicodeRange(ExecutionContext*, const String&, ExceptionState&); |
| 79 void setVariant(ExecutionContext*, const String&, ExceptionState&); | 79 void setVariant(ExecutionContext*, const String&, ExceptionState&); |
| 80 void setFeatureSettings(ExecutionContext*, const String&, ExceptionState&); | 80 void setFeatureSettings(ExecutionContext*, const String&, ExceptionState&); |
| 81 | 81 |
| 82 String status() const; | 82 String status() const; |
| 83 | 83 |
| 84 void load(ExecutionContext*); | 84 ScriptPromise load(ExecutionContext*); |
| 85 ScriptPromise ready(ExecutionContext*); | |
| 86 | 85 |
| 87 LoadStatus loadStatus() const { return m_status; } | 86 LoadStatus loadStatus() const { return m_status; } |
| 88 void setLoadStatus(LoadStatus); | 87 void setLoadStatus(LoadStatus); |
| 89 DOMError* error() const { return m_error.get(); } | 88 DOMError* error() const { return m_error.get(); } |
| 90 FontTraits traits() const; | 89 FontTraits traits() const; |
| 91 CSSFontFace* cssFontFace() { return m_cssFontFace.get(); } | 90 CSSFontFace* cssFontFace() { return m_cssFontFace.get(); } |
| 92 | 91 |
| 93 void trace(Visitor*); | 92 void trace(Visitor*); |
| 94 | 93 |
| 95 bool hadBlankText() const; | 94 bool hadBlankText() const; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 118 | 117 |
| 119 Vector<OwnPtr<FontFaceReadyPromiseResolver> > m_readyResolvers; | 118 Vector<OwnPtr<FontFaceReadyPromiseResolver> > m_readyResolvers; |
| 120 OwnPtr<CSSFontFace> m_cssFontFace; | 119 OwnPtr<CSSFontFace> m_cssFontFace; |
| 121 }; | 120 }; |
| 122 | 121 |
| 123 typedef Vector<RefPtr<FontFace> > FontFaceArray; | 122 typedef Vector<RefPtr<FontFace> > FontFaceArray; |
| 124 | 123 |
| 125 } // namespace WebCore | 124 } // namespace WebCore |
| 126 | 125 |
| 127 #endif // FontFace_h | 126 #endif // FontFace_h |
| OLD | NEW |