Revert "Extract ContextLifecycleNotifier from ScriptExecutionContext."

Source/core/dom/DocumentLifecycleObserver.cpp

Index: Source/core/dom/DocumentLifecycleObserver.cpp
diff --git a/Source/core/dom/DocumentLifecycleObserver.cpp b/Source/core/dom/DocumentLifecycleObserver.cpp
index 9ddc8bd37d5f9feadf2af284bb2f37638c792dcb..2a231acd0cd9390db2b2927b5a389d57c428891e 100644
--- a/Source/core/dom/DocumentLifecycleObserver.cpp
+++ b/Source/core/dom/DocumentLifecycleObserver.cpp
@@ -32,34 +32,21 @@
 namespace WebCore {
 
 DocumentLifecycleObserver::DocumentLifecycleObserver(Document* document)
-    : ContextDestructionObserver(document, DocumentLifecycleObserverType)
+    : ContextDestructionObserver(document)
 {
+    document->addLifecycleObserver(this);
 }
 
-DocumentLifecycleObserver::~DocumentLifecycleObserver()
+PassOwnPtr<DocumentLifecycleNotifier> DocumentLifecycleNotifier::create()
 {
-    observeContext(0, DocumentLifecycleObserverType);
+    return adoptPtr(new DocumentLifecycleNotifier());
 }
 
-DocumentLifecycleNotifier::DocumentLifecycleNotifier(ScriptExecutionContext* context)
-    : ContextLifecycleNotifier(context)
+void DocumentLifecycleNotifier::addObserver(DocumentLifecycleObserver* observer)
 {
-}
-
-void DocumentLifecycleNotifier::addObserver(ContextDestructionObserver* observer, ContextDestructionObserver::Type as)
-{
-    RELEASE_ASSERT(!m_iterating);
-    if (as == ContextDestructionObserver::DocumentLifecycleObserverType)
-        m_documentObservers.add(static_cast<DocumentLifecycleObserver*>(observer));
-    ContextLifecycleNotifier::addObserver(observer, as);
-}
-
-void DocumentLifecycleNotifier::removeObserver(ContextDestructionObserver* observer, ContextDestructionObserver::Type as)
-{
-    RELEASE_ASSERT(!m_iterating);
-    if (as == ContextDestructionObserver::DocumentLifecycleObserverType)
-        m_documentObservers.remove(static_cast<DocumentLifecycleObserver*>(observer));
-    ContextLifecycleNotifier::removeObserver(observer, as);
+    ASSERT(!m_iterating);
+    ASSERT(!m_observers.contains(observer));
+    m_observers.append(observer);
 }
 
 } // namespace WebCore