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

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

Issue 2567913002: Rename ActiveDOMObject to SuspendableObject (Closed)
Patch Set: Created 4 years 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(this), 157 : ActiveScriptWrappable(this),
158 ActiveDOMObject(context), 158 SuspendableObject(context),
159 m_status(Unloaded) { 159 m_status(Unloaded) {
160 suspendIfNeeded(); 160 suspendIfNeeded();
161 } 161 }
162 162
163 FontFace::FontFace(ExecutionContext* context, 163 FontFace::FontFace(ExecutionContext* context,
164 const AtomicString& family, 164 const AtomicString& family,
165 const FontFaceDescriptors& descriptors) 165 const FontFaceDescriptors& descriptors)
166 : ActiveScriptWrappable(this), 166 : ActiveScriptWrappable(this),
167 ActiveDOMObject(context), 167 SuspendableObject(context),
168 m_family(family), 168 m_family(family),
169 m_status(Unloaded) { 169 m_status(Unloaded) {
170 Document* document = toDocument(context); 170 Document* document = toDocument(context);
171 setPropertyFromString(document, descriptors.style(), CSSPropertyFontStyle); 171 setPropertyFromString(document, descriptors.style(), CSSPropertyFontStyle);
172 setPropertyFromString(document, descriptors.weight(), CSSPropertyFontWeight); 172 setPropertyFromString(document, descriptors.weight(), CSSPropertyFontWeight);
173 setPropertyFromString(document, descriptors.stretch(), 173 setPropertyFromString(document, descriptors.stretch(),
174 CSSPropertyFontStretch); 174 CSSPropertyFontStretch);
175 setPropertyFromString(document, descriptors.unicodeRange(), 175 setPropertyFromString(document, descriptors.unicodeRange(),
176 CSSPropertyUnicodeRange); 176 CSSPropertyUnicodeRange);
177 setPropertyFromString(document, descriptors.variant(), 177 setPropertyFromString(document, descriptors.variant(),
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 visitor->trace(m_weight); 637 visitor->trace(m_weight);
638 visitor->trace(m_stretch); 638 visitor->trace(m_stretch);
639 visitor->trace(m_unicodeRange); 639 visitor->trace(m_unicodeRange);
640 visitor->trace(m_variant); 640 visitor->trace(m_variant);
641 visitor->trace(m_featureSettings); 641 visitor->trace(m_featureSettings);
642 visitor->trace(m_display); 642 visitor->trace(m_display);
643 visitor->trace(m_error); 643 visitor->trace(m_error);
644 visitor->trace(m_loadedProperty); 644 visitor->trace(m_loadedProperty);
645 visitor->trace(m_cssFontFace); 645 visitor->trace(m_cssFontFace);
646 visitor->trace(m_callbacks); 646 visitor->trace(m_callbacks);
647 ActiveDOMObject::trace(visitor); 647 SuspendableObject::trace(visitor);
648 } 648 }
649 649
650 bool FontFace::hadBlankText() const { 650 bool FontFace::hadBlankText() const {
651 return m_cssFontFace->hadBlankText(); 651 return m_cssFontFace->hadBlankText();
652 } 652 }
653 653
654 bool FontFace::hasPendingActivity() const { 654 bool FontFace::hasPendingActivity() const {
655 return m_status == Loading && getExecutionContext() && 655 return m_status == Loading && getExecutionContext() &&
656 !getExecutionContext()->isContextDestroyed(); 656 !getExecutionContext()->isContextDestroyed();
657 } 657 }
658 658
659 } // namespace blink 659 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698