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

Source/core/frame/LocalDOMWindow.h

 /*
  * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef LocalDOMWindow_h
 #define LocalDOMWindow_h
 
 #include "core/events/EventTarget.h"
 #include "core/frame/DOMWindow.h"
-#include "core/frame/DOMWindowLifecycleNotifier.h"
 #include "core/frame/FrameDestructionObserver.h"
 #include "core/frame/LocalFrame.h"
+#include "platform/LifecycleContext.h"
 #include "platform/Supplementable.h"
 #include "platform/heap/Handle.h"
 
 #include "wtf/Assertions.h"
 #include "wtf/Forward.h"
 
 namespace blink {
 
 class DOMWindowEventQueue;
+class DOMWindowLifecycleNotifier;
 class DOMWindowProperty;
 class DocumentInit;
 class EventListener;
 class EventQueue;
 class ExceptionState;
 class FrameConsole;
 class IntRect;
 class Page;
 class PostMessageTimer;
 class ScriptCallStack;
 class SecurityOrigin;
 
 enum PageshowEventPersistence {
     PageshowEventNotPersisted = 0,
     PageshowEventPersisted = 1
 };
 
 // Note: if you're thinking of returning something DOM-related by reference,
 // please ping dcheng@chromium.org first. You probably don't want to do that.
-class LocalDOMWindow final : public DOMWindow, public WillBeHeapSupplementable<LocalDOMWindow>, public DOMWindowLifecycleNotifier {
+class LocalDOMWindow final : public DOMWindow, public WillBeHeapSupplementable<LocalDOMWindow>, public LifecycleContext<LocalDOMWindow> {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalDOMWindow);
 public:
     static PassRefPtrWillBeRawPtr<Document> createDocument(const String& mimeType, const DocumentInit&, bool forceXHTML);
     static PassRefPtrWillBeRawPtr<LocalDOMWindow> create(LocalFrame& frame)
     {
         return adoptRefWillBeNoop(new LocalDOMWindow(frame));
     }
     virtual ~LocalDOMWindow();
 
     PassRefPtrWillBeRawPtr<Document> installNewDocument(const String& mimeType, const DocumentInit&, bool forceXHTML = false);
@@ skipping 117 matching lines @@
     ApplicationCache* optionalApplicationCache() const { return m_applicationCache.get(); }
 
     // Dispatch the (deprecated) orientationchange event to this DOMWindow and
     // recurse on its child frames.
     void sendOrientationChangeEvent();
 
     void willDetachDocumentFromFrame();
 
     bool isInsecureScriptAccess(DOMWindow& callingWindow, const String& urlString) override;
 
+    PassOwnPtr<LifecycleNotifier<LocalDOMWindow>> createLifecycleNotifier();
+
     EventQueue* eventQueue() const;
     void enqueueWindowEvent(PassRefPtrWillBeRawPtr<Event>);
     void enqueueDocumentEvent(PassRefPtrWillBeRawPtr<Event>);
     void enqueuePageshowEvent(PageshowEventPersistence);
     void enqueueHashchangeEvent(const String& oldURL, const String& newURL);
     void enqueuePopstateEvent(PassRefPtr<SerializedScriptValue>);
     void dispatchWindowLoadEvent();
     void documentWasClosed();
     void statePopped(PassRefPtr<SerializedScriptValue>);
 
     // FIXME: This shouldn't be public once LocalDOMWindow becomes ExecutionContext.
     void clearEventQueue();
 
     void acceptLanguagesChanged();
 
     virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) override;
 
+protected:
+    DOMWindowLifecycleNotifier& lifecycleNotifier();
+
 private:
     // Rather than simply inheriting FrameDestructionObserver like most other
     // classes, LocalDOMWindow hides its FrameDestructionObserver with
     // composition. This prevents conflicting overloads between DOMWindow, which
     // has a frame() accessor that returns Frame* for bindings code, and
     // FrameDestructionObserver, which has a frame() accessor that returns a
     // LocalFrame*.
     class WindowFrameObserver final : public NoBaseWillBeGarbageCollected<WindowFrameObserver>, public FrameDestructionObserver {
         WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
         WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WindowFrameObserver);
@@ skipping 79 matching lines @@
 }
 
 inline String LocalDOMWindow::defaultStatus() const
 {
     return m_defaultStatus;
 }
 
 } // namespace blink
 
 #endif // LocalDOMWindow_h