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 3c49e503f5fe142314b280f1ab76e4e95eafd2ff..d992f1db8739ca458a75e4e3cc48d41a7c90b4b5 100644 |
--- a/third_party/WebKit/Source/core/css/FontFace.cpp |
+++ b/third_party/WebKit/Source/core/css/FontFace.cpp |
@@ -138,14 +138,13 @@ PassRefPtrWillBeRawPtr<FontFace> FontFace::create(Document* document, const Styl |
} |
FontFace::FontFace(ExecutionContext* context) |
- : ActiveDOMObject(context) |
+ : ContextLifecycleObserver(context) |
, m_status(Unloaded) |
{ |
- suspendIfNeeded(); |
} |
FontFace::FontFace(ExecutionContext* context, const AtomicString& family, const FontFaceDescriptors& descriptors) |
- : ActiveDOMObject(context) |
+ : ContextLifecycleObserver(context) |
, m_family(family) |
, m_status(Unloaded) |
{ |
@@ -156,8 +155,6 @@ FontFace::FontFace(ExecutionContext* context, const AtomicString& family, const |
setPropertyFromString(document, descriptors.unicodeRange(), CSSPropertyUnicodeRange); |
setPropertyFromString(document, descriptors.variant(), CSSPropertyFontVariant); |
setPropertyFromString(document, descriptors.featureSettings(), CSSPropertyFontFeatureSettings); |
- |
- suspendIfNeeded(); |
} |
FontFace::~FontFace() |
@@ -636,7 +633,7 @@ DEFINE_TRACE(FontFace) |
visitor->trace(m_loadedProperty); |
visitor->trace(m_cssFontFace); |
visitor->trace(m_callbacks); |
- ActiveDOMObject::trace(visitor); |
+ ContextLifecycleObserver::trace(visitor); |
} |
bool FontFace::hadBlankText() const |