| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 CSSPropertyFontFeatureSettings) && | 147 CSSPropertyFontFeatureSettings) && |
| 148 fontFace->setPropertyFromStyle(properties, CSSPropertyFontDisplay) && | 148 fontFace->setPropertyFromStyle(properties, CSSPropertyFontDisplay) && |
| 149 !fontFace->family().isEmpty() && fontFace->traits().bitfield()) { | 149 !fontFace->family().isEmpty() && fontFace->traits().bitfield()) { |
| 150 fontFace->initCSSFontFace(document, src); | 150 fontFace->initCSSFontFace(document, src); |
| 151 return fontFace; | 151 return fontFace; |
| 152 } | 152 } |
| 153 return nullptr; | 153 return nullptr; |
| 154 } | 154 } |
| 155 | 155 |
| 156 FontFace::FontFace(ExecutionContext* context) | 156 FontFace::FontFace(ExecutionContext* context) |
| 157 : ActiveScriptWrappable<FontFace>(this), | 157 : SuspendableObject(context), m_status(Unloaded) { |
| 158 SuspendableObject(context), | |
| 159 m_status(Unloaded) { | |
| 160 suspendIfNeeded(); | 158 suspendIfNeeded(); |
| 161 } | 159 } |
| 162 | 160 |
| 163 FontFace::FontFace(ExecutionContext* context, | 161 FontFace::FontFace(ExecutionContext* context, |
| 164 const AtomicString& family, | 162 const AtomicString& family, |
| 165 const FontFaceDescriptors& descriptors) | 163 const FontFaceDescriptors& descriptors) |
| 166 : ActiveScriptWrappable(this), | 164 : SuspendableObject(context), m_family(family), m_status(Unloaded) { |
| 167 SuspendableObject(context), | |
| 168 m_family(family), | |
| 169 m_status(Unloaded) { | |
| 170 Document* document = toDocument(context); | 165 Document* document = toDocument(context); |
| 171 setPropertyFromString(document, descriptors.style(), CSSPropertyFontStyle); | 166 setPropertyFromString(document, descriptors.style(), CSSPropertyFontStyle); |
| 172 setPropertyFromString(document, descriptors.weight(), CSSPropertyFontWeight); | 167 setPropertyFromString(document, descriptors.weight(), CSSPropertyFontWeight); |
| 173 setPropertyFromString(document, descriptors.stretch(), | 168 setPropertyFromString(document, descriptors.stretch(), |
| 174 CSSPropertyFontStretch); | 169 CSSPropertyFontStretch); |
| 175 setPropertyFromString(document, descriptors.unicodeRange(), | 170 setPropertyFromString(document, descriptors.unicodeRange(), |
| 176 CSSPropertyUnicodeRange); | 171 CSSPropertyUnicodeRange); |
| 177 setPropertyFromString(document, descriptors.variant(), | 172 setPropertyFromString(document, descriptors.variant(), |
| 178 CSSPropertyFontVariant); | 173 CSSPropertyFontVariant); |
| 179 setPropertyFromString(document, descriptors.featureSettings(), | 174 setPropertyFromString(document, descriptors.featureSettings(), |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 | 644 |
| 650 bool FontFace::hadBlankText() const { | 645 bool FontFace::hadBlankText() const { |
| 651 return m_cssFontFace->hadBlankText(); | 646 return m_cssFontFace->hadBlankText(); |
| 652 } | 647 } |
| 653 | 648 |
| 654 bool FontFace::hasPendingActivity() const { | 649 bool FontFace::hasPendingActivity() const { |
| 655 return m_status == Loading && getExecutionContext(); | 650 return m_status == Loading && getExecutionContext(); |
| 656 } | 651 } |
| 657 | 652 |
| 658 } // namespace blink | 653 } // namespace blink |
| OLD | NEW |