Revert "Extract ContextLifecycleNotifier from ScriptExecutionContext."

Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 625 matching lines @@
 
     m_markers->detach();
 
     m_cssCanvasElements.clear();
 
     // FIXME: consider using ActiveDOMObject.
     if (m_scriptedAnimationController)
         m_scriptedAnimationController->clearDocumentPointer();
     m_scriptedAnimationController.clear();
 
-    lifecycleNotifier()->notifyDocumentWasDisposed();
+    if (m_lifecycleNotifier)
+        m_lifecycleNotifier->notifyDocumentWasDisposed();
 }
 
 Element* Document::getElementById(const AtomicString& id) const
 {
     return TreeScope::getElementById(id);
 }
 
 Element* Document::getElementByAccessKey(const String& key)
 {
     if (key.isEmpty())
@@ skipping 1337 matching lines @@
     // us. However, this violates Node::detach() semantics, as it's never
     // possible to re-attach. Eventually Document::detach() should be renamed,
     // or this setting of the frame to 0 could be made explicit in each of the
     // callers of Document::detach().
     m_frame = 0;
     m_renderArena.clear();
 
     if (m_mediaQueryMatcher)
         m_mediaQueryMatcher->documentDestroyed();
 
-    lifecycleNotifier()->notifyDocumentWasDetached();
+    if (m_lifecycleNotifier)
+        m_lifecycleNotifier->notifyDocumentWasDetached();
 }
 
 void Document::prepareForDestruction()
 {
     disconnectDescendantFrames();
     if (DOMWindow* window = this->domWindow())
         window->willDetachDocumentFromFrame();
     detach();
 }
 
@@ skipping 3202 matching lines @@
     if (!frame() || !frame()->page())
         return;
 
     Vector<RefPtr<Element> > associatedFormControls;
     copyToVector(m_associatedFormControls, associatedFormControls);
 
     frame()->page()->chrome().client()->didAssociateFormControls(associatedFormControls);
     m_associatedFormControls.clear();
 }
 
-PassOwnPtr<ContextLifecycleNotifier> Document::createLifecycleNotifier()
+void Document::addLifecycleObserver(DocumentLifecycleObserver* observer)
 {
-    return DocumentLifecycleNotifier::create(this);
-}
-
-DocumentLifecycleNotifier* Document::lifecycleNotifier()
-{
-    return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifecycleNotifier());
+    if (!m_lifecycleNotifier)
+        m_lifecycleNotifier = DocumentLifecycleNotifier::create();
+    m_lifecycleNotifier->addObserver(observer);
 }
 
 } // namespace WebCore