Remove DOMWindowLifecycleObserver

third_party/WebKit/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 481 matching lines @@
 }
 
 MediaQueryList* LocalDOMWindow::matchMedia(const String& media)
 {
     return document() ? document()->mediaQueryMatcher().matchMedia(media) : nullptr;
 }
 
 void LocalDOMWindow::willDetachFrameHost()
 {
     frame()->host()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
-    LocalDOMWindow::notifyContextDestroyed();
 }
 
 void LocalDOMWindow::frameDestroyed()
 {
     willDestroyDocumentInFrame();
     resetLocation();
     m_properties.clear();
     removeAllEventListeners();
 }
 
@@ skipping 12 matching lines @@
 void LocalDOMWindow::registerProperty(DOMWindowProperty* property)
 {
     m_properties.add(property);
 }
 
 void LocalDOMWindow::unregisterProperty(DOMWindowProperty* property)
 {
     m_properties.remove(property);
 }
 
+void LocalDOMWindow::registerEventListenerObserver(EventListenerObserver* eventListenerObserver)
+{
+    m_eventListenerObservers.add(eventListenerObserver);
+}
+
 void LocalDOMWindow::reset()
 {
     m_frameObserver->contextDestroyed();
 
     m_screen = nullptr;
     m_history = nullptr;
     m_locationbar = nullptr;
     m_menubar = nullptr;
     m_personalbar = nullptr;
     m_scrollbars = nullptr;
     m_statusbar = nullptr;
     m_toolbar = nullptr;
     m_navigator = nullptr;
     m_media = nullptr;
     m_customElements = nullptr;
     m_applicationCache = nullptr;
-
-    LocalDOMWindow::notifyContextDestroyed();
 }
 
 void LocalDOMWindow::sendOrientationChangeEvent()
 {
     ASSERT(RuntimeEnabledFeatures::orientationEventEnabled());
     ASSERT(frame()->isMainFrame());
 
     // Before dispatching the event, build a list of all frames in the page
     // to send the event to, to mitigate side effects from event handlers
     // potentially interfering with others.
@@ skipping 797 matching lines @@
 
 void LocalDOMWindow::addedEventListener(const AtomicString& eventType, RegisteredEventListener& registeredListener)
 {
     DOMWindow::addedEventListener(eventType, registeredListener);
     if (frame() && frame()->host())
         frame()->host()->eventHandlerRegistry().didAddEventHandler(*this, eventType, registeredListener.options());
 
     if (Document* document = this->document())
         document->addListenerTypeIfNeeded(eventType);
 
-    notifyAddEventListener(this, eventType);
+    for (auto& it : m_eventListenerObservers) {
+        it->didAddEventListener(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);
         }
     }
 }
 
 void LocalDOMWindow::removedEventListener(const AtomicString& eventType, const RegisteredEventListener& registeredListener)
 {
     DOMWindow::removedEventListener(eventType, registeredListener);
     if (frame() && frame()->host())
         frame()->host()->eventHandlerRegistry().didRemoveEventHandler(*this, eventType, registeredListener.options());
 
-    notifyRemoveEventListener(this, eventType);
+    for (auto& it : m_eventListenerObservers) {
+        it->didRemoveEventListener(this, eventType);
+    }
 
     if (eventType == EventTypeNames::unload) {
         removeUnloadEventListener(this);
     } else if (eventType == EventTypeNames::beforeunload && allowsBeforeUnloadListeners(this)) {
         removeBeforeUnloadEventListener(this);
     }
 }
 
 void LocalDOMWindow::dispatchLoadEvent()
 {
@@ skipping 29 matching lines @@
     event->setEventPhase(Event::AT_TARGET);
 
     TRACE_EVENT1("devtools.timeline", "EventDispatch", "data", InspectorEventDispatchEvent::data(*event));
     return fireEventListeners(event);
 }
 
 void LocalDOMWindow::removeAllEventListeners()
 {
     EventTarget::removeAllEventListeners();
 
-    notifyRemoveAllEventListeners(this);
+    for (auto& it : m_eventListenerObservers) {
+        it->didRemoveAllEventListeners(this);
+    }
+
     if (frame() && frame()->host())
         frame()->host()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
 
     removeAllUnloadEventListeners(this);
     removeAllBeforeUnloadEventListeners(this);
 }
 
 void LocalDOMWindow::finishedLoading()
 {
     if (m_shouldPrintWhenFinishedLoading) {
@@ skipping 84 matching lines @@
     visitor->trace(m_scrollbars);
     visitor->trace(m_statusbar);
     visitor->trace(m_toolbar);
     visitor->trace(m_navigator);
     visitor->trace(m_media);
     visitor->trace(m_customElements);
     visitor->trace(m_applicationCache);
     visitor->trace(m_eventQueue);
     visitor->trace(m_postMessageTimers);
     visitor->trace(m_visualViewport);
+    visitor->trace(m_eventListenerObservers);
     DOMWindow::trace(visitor);
     Supplementable<LocalDOMWindow>::trace(visitor);
-    DOMWindowLifecycleNotifier::trace(visitor);
 }
 
 LocalFrame* LocalDOMWindow::frame() const
 {
     // If the LocalDOMWindow still has a frame reference, that frame must point
     // back to this LocalDOMWindow: otherwise, it's easy to get into a situation
     // where script execution leaks between different LocalDOMWindows.
     if (m_frameObserver->frame())
         ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() == this);
     return m_frameObserver->frame();
 }
 
 } // namespace blink