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

Source/core/frame/LocalDOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 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 364 matching lines @@
 {
     if (!frame)
         return false;
     FrameHost* host = frame->host();
     if (!host)
         return false;
     return host->chrome().canRunModalNow();
 }
 
 LocalDOMWindow::LocalDOMWindow(LocalFrame& frame)
-    : DOMWindowLifecycleNotifier(this)
-    , m_frameObserver(WindowFrameObserver::create(this, frame))
+    : m_frameObserver(WindowFrameObserver::create(this, frame))
     , m_shouldPrintWhenFinishedLoading(false)
 #if ENABLE(ASSERT)
     , m_hasBeenReset(false)
 #endif
 {
 }
 
 void LocalDOMWindow::clearDocument()
 {
     if (!m_document)
@@ skipping 497 matching lines @@
 {
     if (!frame())
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
     ASSERT(context);
 
-    bool allowFocus = context->isWindowInteractionAllowed();
+    bool allowFocus = context->isWindowFocusAllowed();
     if (allowFocus) {
-        context->consumeWindowInteraction();
+        context->consumeWindowFocus();
     } else {
         ASSERT(isMainThread());
         allowFocus = opener() && (opener() != this) && (toDocument(context)->domWindow() == opener());
     }
 
     // If we're a top level window, bring the window to the front.
     if (frame()->isMainFrame() && allowFocus)
         host->chrome().focus();
 
     frame()->eventHandler().focusDocumentView();
@@ skipping 582 matching lines @@
     if (!EventTarget::addEventListener(eventType, listener, useCapture))
         return false;
 
     if (frame() && frame()->host())
         frame()->host()->eventHandlerRegistry().didAddEventHandler(*this, eventType);
 
     if (Document* document = this->document()) {
         document->addListenerTypeIfNeeded(eventType);
     }
 
-    notifyAddEventListener(this, eventType);
+    lifecycleNotifier().notifyAddEventListener(this, eventType);
 
     if (eventType == EventTypeNames::unload) {
         UseCounter::count(document(), UseCounter::DocumentUnloadRegistered);
         addUnloadEventListener(this);
     } else if (eventType == EventTypeNames::beforeunload) {
         UseCounter::count(document(), UseCounter::DocumentBeforeUnloadRegistered);
         if (allowsBeforeUnloadListeners(this)) {
             // This is confusingly named. It doesn't actually add the listener. It just increments a count
             // so that we know we have listeners registered for the purposes of determining if we can
             // fast terminate the renderer process.
             addBeforeUnloadEventListener(this);
         } else {
             // Subframes return false from allowsBeforeUnloadListeners.
             UseCounter::count(document(), UseCounter::SubFrameBeforeUnloadRegistered);
         }
     }
 
     return true;
 }
 
 bool LocalDOMWindow::removeEventListener(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture)
 {
     if (!EventTarget::removeEventListener(eventType, listener, useCapture))
         return false;
 
     if (frame() && frame()->host())
         frame()->host()->eventHandlerRegistry().didRemoveEventHandler(*this, eventType);
 
-    notifyRemoveEventListener(this, eventType);
+    lifecycleNotifier().notifyRemoveEventListener(this, eventType);
 
     if (eventType == EventTypeNames::unload) {
         removeUnloadEventListener(this);
     } else if (eventType == EventTypeNames::beforeunload && allowsBeforeUnloadListeners(this)) {
         removeBeforeUnloadEventListener(this);
     }
 
     return true;
 }
 
@@ skipping 43 matching lines @@
     InspectorInstrumentation::didDispatchEventOnWindow(cookie);
 
     return result;
 }
 
 void LocalDOMWindow::removeAllEventListenersInternal(BroadcastListenerRemoval mode)
 {
     EventTarget::removeAllEventListeners();
 
     if (mode == DoBroadcastListenerRemoval) {
-        notifyRemoveAllEventListeners(this);
+        lifecycleNotifier().notifyRemoveAllEventListeners(this);
         if (frame() && frame()->host())
             frame()->host()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
     }
 
     removeAllUnloadEventListeners(this);
     removeAllBeforeUnloadEventListeners(this);
 }
 
 void LocalDOMWindow::removeAllEventListeners()
 {
@@ skipping 172 matching lines @@
 
     WindowFeatures windowFeatures(dialogFeaturesString, screenAvailableRect(frame()->view()));
     LocalFrame* dialogFrame = createWindow(urlString, emptyAtom, windowFeatures,
         *callingWindow, *firstFrame, *frame(), function, functionContext);
     if (!dialogFrame)
         return;
     UserGestureIndicatorDisabler disabler;
     dialogFrame->host()->chrome().runModal();
 }
 
+DOMWindowLifecycleNotifier& LocalDOMWindow::lifecycleNotifier()
+{
+    return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<LocalDOMWindow>::lifecycleNotifier());
+}
+
+PassOwnPtr<LifecycleNotifier<LocalDOMWindow>> LocalDOMWindow::createLifecycleNotifier()
+{
+    return DOMWindowLifecycleNotifier::create(this);
+}
+
 void LocalDOMWindow::trace(Visitor* visitor)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_frameObserver);
     visitor->trace(m_document);
     visitor->trace(m_properties);
     visitor->trace(m_screen);
     visitor->trace(m_history);
     visitor->trace(m_locationbar);
     visitor->trace(m_menubar);
     visitor->trace(m_personalbar);
     visitor->trace(m_scrollbars);
     visitor->trace(m_statusbar);
     visitor->trace(m_toolbar);
     visitor->trace(m_console);
     visitor->trace(m_navigator);
     visitor->trace(m_location);
     visitor->trace(m_media);
     visitor->trace(m_applicationCache);
     visitor->trace(m_performance);
     visitor->trace(m_css);
     visitor->trace(m_eventQueue);
     visitor->trace(m_postMessageTimers);
     HeapSupplementable<LocalDOMWindow>::trace(visitor);
 #endif
     DOMWindow::trace(visitor);
-    DOMWindowLifecycleNotifier::trace(visitor);
+    LifecycleContext<LocalDOMWindow>::trace(visitor);
 }
 
 LocalFrame* LocalDOMWindow::frame() const
 {
     return m_frameObserver->frame();
 }
 
 v8::Handle<v8::Object> LocalDOMWindow::wrap(v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     ASSERT_NOT_REACHED(); // LocalDOMWindow has [Custom=ToV8].
     return v8::Handle<v8::Object>();
 }
 
 } // namespace blink