Revert of Prefer using ContextClient over ContextLifecycleObserver

third_party/WebKit/Source/core/css/FontFace.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 136 matching lines @@
                                      CSSPropertyFontFeatureSettings) &&
       fontFace->setPropertyFromStyle(properties, CSSPropertyFontDisplay) &&
       !fontFace->family().isEmpty() && fontFace->traits().bitfield()) {
     fontFace->initCSSFontFace(document, src);
     return fontFace;
   }
   return nullptr;
 }
 
 FontFace::FontFace(ExecutionContext* context)
-    : ContextClient(context), m_status(Unloaded) {}
+    : ContextLifecycleObserver(context), m_status(Unloaded) {}
 
 FontFace::FontFace(ExecutionContext* context,
                    const AtomicString& family,
                    const FontFaceDescriptors& descriptors)
-    : ContextClient(context), m_family(family), m_status(Unloaded) {
+    : ContextLifecycleObserver(context), m_family(family), m_status(Unloaded) {
   Document* document = toDocument(context);
   setPropertyFromString(document, descriptors.style(), CSSPropertyFontStyle);
   setPropertyFromString(document, descriptors.weight(), CSSPropertyFontWeight);
   setPropertyFromString(document, descriptors.stretch(),
                         CSSPropertyFontStretch);
   setPropertyFromString(document, descriptors.unicodeRange(),
                         CSSPropertyUnicodeRange);
   setPropertyFromString(document, descriptors.variant(),
                         CSSPropertyFontVariant);
   setPropertyFromString(document, descriptors.featureSettings(),
@@ skipping 455 matching lines @@
   visitor->trace(m_weight);
   visitor->trace(m_stretch);
   visitor->trace(m_unicodeRange);
   visitor->trace(m_variant);
   visitor->trace(m_featureSettings);
   visitor->trace(m_display);
   visitor->trace(m_error);
   visitor->trace(m_loadedProperty);
   visitor->trace(m_cssFontFace);
   visitor->trace(m_callbacks);
-  ContextClient::trace(visitor);
+  ContextLifecycleObserver::trace(visitor);
 }
 
 bool FontFace::hadBlankText() const {
   return m_cssFontFace->hadBlankText();
 }
 
 bool FontFace::hasPendingActivity() const {
   return m_status == Loading && getExecutionContext();
 }
 
 }  // namespace blink