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

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

Issue 2607533002: Prefer using ContextClient over ContextLifecycleObserver (Closed)
Patch Set: 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 : ContextLifecycleObserver(context), m_status(Unloaded) {} 157 : ContextClient(context), m_status(Unloaded) {}
158 158
159 FontFace::FontFace(ExecutionContext* context, 159 FontFace::FontFace(ExecutionContext* context,
160 const AtomicString& family, 160 const AtomicString& family,
161 const FontFaceDescriptors& descriptors) 161 const FontFaceDescriptors& descriptors)
162 : ContextLifecycleObserver(context), m_family(family), m_status(Unloaded) { 162 : ContextClient(context), m_family(family), m_status(Unloaded) {
163 Document* document = toDocument(context); 163 Document* document = toDocument(context);
164 setPropertyFromString(document, descriptors.style(), CSSPropertyFontStyle); 164 setPropertyFromString(document, descriptors.style(), CSSPropertyFontStyle);
165 setPropertyFromString(document, descriptors.weight(), CSSPropertyFontWeight); 165 setPropertyFromString(document, descriptors.weight(), CSSPropertyFontWeight);
166 setPropertyFromString(document, descriptors.stretch(), 166 setPropertyFromString(document, descriptors.stretch(),
167 CSSPropertyFontStretch); 167 CSSPropertyFontStretch);
168 setPropertyFromString(document, descriptors.unicodeRange(), 168 setPropertyFromString(document, descriptors.unicodeRange(),
169 CSSPropertyUnicodeRange); 169 CSSPropertyUnicodeRange);
170 setPropertyFromString(document, descriptors.variant(), 170 setPropertyFromString(document, descriptors.variant(),
171 CSSPropertyFontVariant); 171 CSSPropertyFontVariant);
172 setPropertyFromString(document, descriptors.featureSettings(), 172 setPropertyFromString(document, descriptors.featureSettings(),
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 visitor->trace(m_weight); 628 visitor->trace(m_weight);
629 visitor->trace(m_stretch); 629 visitor->trace(m_stretch);
630 visitor->trace(m_unicodeRange); 630 visitor->trace(m_unicodeRange);
631 visitor->trace(m_variant); 631 visitor->trace(m_variant);
632 visitor->trace(m_featureSettings); 632 visitor->trace(m_featureSettings);
633 visitor->trace(m_display); 633 visitor->trace(m_display);
634 visitor->trace(m_error); 634 visitor->trace(m_error);
635 visitor->trace(m_loadedProperty); 635 visitor->trace(m_loadedProperty);
636 visitor->trace(m_cssFontFace); 636 visitor->trace(m_cssFontFace);
637 visitor->trace(m_callbacks); 637 visitor->trace(m_callbacks);
638 ContextLifecycleObserver::trace(visitor); 638 ContextClient::trace(visitor);
639 } 639 }
640 640
641 bool FontFace::hadBlankText() const { 641 bool FontFace::hadBlankText() const {
642 return m_cssFontFace->hadBlankText(); 642 return m_cssFontFace->hadBlankText();
643 } 643 }
644 644
645 bool FontFace::hasPendingActivity() const { 645 bool FontFace::hasPendingActivity() const {
646 return m_status == Loading && getExecutionContext(); 646 return m_status == Loading && getExecutionContext();
647 } 647 }
648 648
649 } // namespace blink 649 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698