| Index: third_party/WebKit/Source/core/css/FontFace.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/FontFace.cpp b/third_party/WebKit/Source/core/css/FontFace.cpp
|
| index 0681159e5aee62aead615c68e37cdeeddba116f1..d23fa0b50fd414352b1215156ca503ff325379c2 100644
|
| --- a/third_party/WebKit/Source/core/css/FontFace.cpp
|
| +++ b/third_party/WebKit/Source/core/css/FontFace.cpp
|
| @@ -154,12 +154,12 @@ FontFace* FontFace::create(Document* document,
|
| }
|
|
|
| FontFace::FontFace(ExecutionContext* context)
|
| - : ContextLifecycleObserver(context), m_status(Unloaded) {}
|
| + : ContextClient(context), m_status(Unloaded) {}
|
|
|
| FontFace::FontFace(ExecutionContext* context,
|
| const AtomicString& family,
|
| const FontFaceDescriptors& descriptors)
|
| - : ContextLifecycleObserver(context), m_family(family), m_status(Unloaded) {
|
| + : ContextClient(context), m_family(family), m_status(Unloaded) {
|
| Document* document = toDocument(context);
|
| setPropertyFromString(document, descriptors.style(), CSSPropertyFontStyle);
|
| setPropertyFromString(document, descriptors.weight(), CSSPropertyFontWeight);
|
| @@ -635,7 +635,7 @@ DEFINE_TRACE(FontFace) {
|
| visitor->trace(m_loadedProperty);
|
| visitor->trace(m_cssFontFace);
|
| visitor->trace(m_callbacks);
|
| - ContextLifecycleObserver::trace(visitor);
|
| + ContextClient::trace(visitor);
|
| }
|
|
|
| bool FontFace::hadBlankText() const {
|
|
|