Revert r189385 "Remove LifecycleContext" and r189391, r189530, r189456 that block it

Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 32 matching lines @@
 #include "core/layout/Layer.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/HistoryItem.h"
 #include "core/page/AutoscrollController.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/ContextMenuController.h"
 #include "core/page/DragController.h"
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
+#include "core/page/PageLifecycleNotifier.h"
 #include "core/page/PointerLockController.h"
 #include "core/page/ValidationMessageClient.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/TextAutosizer.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/plugins/PluginData.h"
 #include "wtf/HashMap.h"
 #include "wtf/RefCountedLeakCounter.h"
 #include "wtf/StdLibExtras.h"
@@ skipping 42 matching lines @@
 {
     if (!frame)
         return 1;
     Page* page = frame->page();
     if (!page)
         return 1;
     return page->deviceScaleFactor();
 }
 
 Page::Page(PageClients& pageClients)
-    : PageLifecycleNotifier(this)
-    , SettingsDelegate(Settings::create())
+    : SettingsDelegate(Settings::create())
     , m_animator(PageAnimator::create(*this))
     , m_autoscrollController(AutoscrollController::create(*this))
     , m_chrome(Chrome::create(this, pageClients.chromeClient))
     , m_dragCaretController(DragCaretController::create())
     , m_dragController(DragController::create(this, pageClients.dragClient))
     , m_focusController(FocusController::create(this))
     , m_contextMenuController(ContextMenuController::create(this, pageClients.contextMenuClient))
     , m_inspectorController(InspectorController::create(this, pageClients.inspectorClient))
     , m_pointerLockController(PointerLockController::create(this))
     , m_undoStack(UndoStack::create())
@@ skipping 293 matching lines @@
     if (m_visibilityState == visibilityState)
         return;
     m_visibilityState = visibilityState;
 
     if (visibilityState == blink::PageVisibilityStateVisible)
         setTimerAlignmentInterval(DOMTimer::visiblePageAlignmentInterval());
     else
         setTimerAlignmentInterval(DOMTimer::hiddenPageAlignmentInterval());
 
     if (!isInitialState)
-        notifyPageVisibilityChanged();
+        lifecycleNotifier().notifyPageVisibilityChanged();
 
     if (!isInitialState && m_mainFrame && m_mainFrame->isLocalFrame())
         deprecatedLocalMainFrame()->didChangeVisibilityState();
 }
 
 PageVisibilityState Page::visibilityState() const
 {
     return m_visibilityState;
 }
 
@@ skipping 85 matching lines @@
     for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (!frame->isLocalFrame())
             continue;
         if (FrameView* view = toLocalFrame(frame)->view())
             view->updateAcceleratedCompositingSettings();
     }
 }
 
 void Page::didCommitLoad(LocalFrame* frame)
 {
-    notifyDidCommitLoad(frame);
+    lifecycleNotifier().notifyDidCommitLoad(frame);
     if (m_mainFrame == frame) {
         frame->console().clearMessages();
         useCounter().didCommitLoad();
         m_inspectorController->didCommitLoadForMainFrame();
         UserGestureIndicator::clearProcessedUserGestureSinceLoad();
     }
 }
 
 void Page::acceptLanguagesChanged()
 {
     WillBeHeapVector<RefPtrWillBeMember<LocalFrame>> frames;
 
     // Even though we don't fire an event from here, the LocalDOMWindow's will fire
     // an event so we keep the frames alive until we are done.
     for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (frame->isLocalFrame())
             frames.append(toLocalFrame(frame));
     }
 
     for (unsigned i = 0; i < frames.size(); ++i)
         frames[i]->localDOMWindow()->acceptLanguagesChanged();
 }
 
+PageLifecycleNotifier& Page::lifecycleNotifier()
+{
+    return static_cast<PageLifecycleNotifier&>(LifecycleContext<Page>::lifecycleNotifier());
+}
+
+PassOwnPtr<LifecycleNotifier<Page>> Page::createLifecycleNotifier()
+{
+    return PageLifecycleNotifier::create(this);
+}
+
 void Page::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_animator);
     visitor->trace(m_dragCaretController);
     visitor->trace(m_dragController);
     visitor->trace(m_focusController);
     visitor->trace(m_contextMenuController);
     visitor->trace(m_inspectorController);
     visitor->trace(m_pointerLockController);
     visitor->trace(m_undoStack);
     visitor->trace(m_mainFrame);
     visitor->trace(m_validationMessageClient);
     visitor->trace(m_multisamplingChangedObservers);
     visitor->trace(m_frameHost);
     HeapSupplementable<Page>::trace(visitor);
 #endif
-    PageLifecycleNotifier::trace(visitor);
+    LifecycleContext<Page>::trace(visitor);
 }
 
 void Page::willBeDestroyed()
 {
     // Destroy inspector first, since it uses frame and view during destruction.
     m_inspectorController->willBeDestroyed();
 
     RefPtrWillBeRawPtr<Frame> mainFrame = m_mainFrame;
 
     mainFrame->detach();
@@ skipping 32 matching lines @@
     , inspectorClient(nullptr)
     , spellCheckerClient(nullptr)
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 } // namespace blink