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

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

Issue 2721603005: Convert unnecessary ContextLifecycleObservers into ContextClients. (Closed)
Patch Set: normalize trace method Created 3 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 CSSPropertyFontFeatureSettings) && 150 CSSPropertyFontFeatureSettings) &&
151 fontFace->setPropertyFromStyle(properties, CSSPropertyFontDisplay) && 151 fontFace->setPropertyFromStyle(properties, CSSPropertyFontDisplay) &&
152 !fontFace->family().isEmpty() && fontFace->traits().bitfield()) { 152 !fontFace->family().isEmpty() && fontFace->traits().bitfield()) {
153 fontFace->initCSSFontFace(document, src); 153 fontFace->initCSSFontFace(document, src);
154 return fontFace; 154 return fontFace;
155 } 155 }
156 return nullptr; 156 return nullptr;
157 } 157 }
158 158
159 FontFace::FontFace(ExecutionContext* context) 159 FontFace::FontFace(ExecutionContext* context)
160 : ContextLifecycleObserver(context), m_status(Unloaded) {} 160 : ContextClient(context), m_status(Unloaded) {}
161 161
162 FontFace::FontFace(ExecutionContext* context, 162 FontFace::FontFace(ExecutionContext* context,
163 const AtomicString& family, 163 const AtomicString& family,
164 const FontFaceDescriptors& descriptors) 164 const FontFaceDescriptors& descriptors)
165 : ContextLifecycleObserver(context), m_family(family), m_status(Unloaded) { 165 : ContextClient(context), m_family(family), m_status(Unloaded) {
166 Document* document = toDocument(context); 166 Document* document = toDocument(context);
167 setPropertyFromString(document, descriptors.style(), CSSPropertyFontStyle); 167 setPropertyFromString(document, descriptors.style(), CSSPropertyFontStyle);
168 setPropertyFromString(document, descriptors.weight(), CSSPropertyFontWeight); 168 setPropertyFromString(document, descriptors.weight(), CSSPropertyFontWeight);
169 setPropertyFromString(document, descriptors.stretch(), 169 setPropertyFromString(document, descriptors.stretch(),
170 CSSPropertyFontStretch); 170 CSSPropertyFontStretch);
171 setPropertyFromString(document, descriptors.unicodeRange(), 171 setPropertyFromString(document, descriptors.unicodeRange(),
172 CSSPropertyUnicodeRange); 172 CSSPropertyUnicodeRange);
173 setPropertyFromString(document, descriptors.variant(), 173 setPropertyFromString(document, descriptors.variant(),
174 CSSPropertyFontVariant); 174 CSSPropertyFontVariant);
175 setPropertyFromString(document, descriptors.featureSettings(), 175 setPropertyFromString(document, descriptors.featureSettings(),
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 visitor->trace(m_weight); 659 visitor->trace(m_weight);
660 visitor->trace(m_stretch); 660 visitor->trace(m_stretch);
661 visitor->trace(m_unicodeRange); 661 visitor->trace(m_unicodeRange);
662 visitor->trace(m_variant); 662 visitor->trace(m_variant);
663 visitor->trace(m_featureSettings); 663 visitor->trace(m_featureSettings);
664 visitor->trace(m_display); 664 visitor->trace(m_display);
665 visitor->trace(m_error); 665 visitor->trace(m_error);
666 visitor->trace(m_loadedProperty); 666 visitor->trace(m_loadedProperty);
667 visitor->trace(m_cssFontFace); 667 visitor->trace(m_cssFontFace);
668 visitor->trace(m_callbacks); 668 visitor->trace(m_callbacks);
669 ContextLifecycleObserver::trace(visitor); 669 ContextClient::trace(visitor);
670 } 670 }
671 671
672 bool FontFace::hadBlankText() const { 672 bool FontFace::hadBlankText() const {
673 return m_cssFontFace->hadBlankText(); 673 return m_cssFontFace->hadBlankText();
674 } 674 }
675 675
676 bool FontFace::hasPendingActivity() const { 676 bool FontFace::hasPendingActivity() const {
677 return m_status == Loading && getExecutionContext(); 677 return m_status == Loading && getExecutionContext();
678 } 678 }
679 679
680 } // namespace blink 680 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/FontFace.h ('k') | third_party/WebKit/Source/modules/filesystem/DOMFileSystem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698