Remove beforeunload events.

sky/engine/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 94 matching lines @@
 }
 
 typedef HashCountedSet<LocalDOMWindow*> DOMWindowSet;
 
 static DOMWindowSet& windowsWithUnloadEventListeners()
 {
     DEFINE_STATIC_LOCAL(DOMWindowSet, windowsWithUnloadEventListeners, ());
     return windowsWithUnloadEventListeners;
 }
 
-static DOMWindowSet& windowsWithBeforeUnloadEventListeners()
-{
-    DEFINE_STATIC_LOCAL(DOMWindowSet, windowsWithBeforeUnloadEventListeners, ());
-    return windowsWithBeforeUnloadEventListeners;
-}
-
 static void addUnloadEventListener(LocalDOMWindow* domWindow)
 {
     DOMWindowSet& set = windowsWithUnloadEventListeners();
     if (set.isEmpty())
         disableSuddenTermination();
     set.add(domWindow);
 }
 
 static void removeUnloadEventListener(LocalDOMWindow* domWindow)
 {
@@ skipping 10 matching lines @@
 {
     DOMWindowSet& set = windowsWithUnloadEventListeners();
     DOMWindowSet::iterator it = set.find(domWindow);
     if (it == set.end())
         return;
     set.removeAll(it);
     if (set.isEmpty())
         enableSuddenTermination();
 }
 
-static void addBeforeUnloadEventListener(LocalDOMWindow* domWindow)
-{
-    DOMWindowSet& set = windowsWithBeforeUnloadEventListeners();
-    if (set.isEmpty())
-        disableSuddenTermination();
-    set.add(domWindow);
-}
-
-static void removeBeforeUnloadEventListener(LocalDOMWindow* domWindow)
-{
-    DOMWindowSet& set = windowsWithBeforeUnloadEventListeners();
-    DOMWindowSet::iterator it = set.find(domWindow);
-    if (it == set.end())
-        return;
-    set.remove(it);
-    if (set.isEmpty())
-        enableSuddenTermination();
-}
-
-static void removeAllBeforeUnloadEventListeners(LocalDOMWindow* domWindow)
-{
-    DOMWindowSet& set = windowsWithBeforeUnloadEventListeners();
-    DOMWindowSet::iterator it = set.find(domWindow);
-    if (it == set.end())
-        return;
-    set.removeAll(it);
-    if (set.isEmpty())
-        enableSuddenTermination();
-}
-
-static bool allowsBeforeUnloadListeners(LocalDOMWindow* window)
-{
-    ASSERT_ARG(window, window);
-    return window->frame();
-}
-
 unsigned LocalDOMWindow::pendingUnloadEventListeners() const
 {
     return windowsWithUnloadEventListeners().count(const_cast<LocalDOMWindow*>(this));
 }
 
 // This function:
 // 1) Validates the pending changes are not changing any value to NaN; in that case keep original value.
 // 2) Constrains the window rect to the minimum window size and no bigger than the float rect's dimensions.
 // 3) Constrains the window rect to within the top and left boundaries of the available screen rect.
 // 4) Constrains the window rect to within the bottom and right boundaries of the available screen rect.
@@ skipping 651 matching lines @@
         m_frame->host()->eventHandlerRegistry().didAddEventHandler(*this, eventType);
 
     if (Document* document = this->document())
         document->addListenerTypeIfNeeded(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 (m_frame && m_frame->host())
         m_frame->host()->eventHandlerRegistry().didRemoveEventHandler(*this, eventType);
 
     lifecycleNotifier().notifyRemoveEventListener(this, eventType);
 
     if (eventType == EventTypeNames::unload) {
         removeUnloadEventListener(this);
-    } else if (eventType == EventTypeNames::beforeunload && allowsBeforeUnloadListeners(this)) {
-        removeBeforeUnloadEventListener(this);
     }
 
     return true;
 }
 
 void LocalDOMWindow::dispatchLoadEvent()
 {
     RefPtrWillBeRawPtr<Event> loadEvent(Event::create(EventTypeNames::load));
     dispatchEvent(loadEvent, document());
 
@@ skipping 23 matching lines @@
     EventTarget::removeAllEventListeners();
 
     lifecycleNotifier().notifyRemoveAllEventListeners(this);
 
     if (mode == DoBroadcastListenerRemoval) {
         if (m_frame && m_frame->host())
             m_frame->host()->eventHandlerRegistry().didRemoveAllEventHandlers(*this);
     }
 
     removeAllUnloadEventListeners(this);
-    removeAllBeforeUnloadEventListeners(this);
 }
 
 void LocalDOMWindow::removeAllEventListeners()
 {
     removeAllEventListenersInternal(DoBroadcastListenerRemoval);
 }
 
 void LocalDOMWindow::setLocation(const String& urlString, LocalDOMWindow* callingWindow, LocalDOMWindow* enteredWindow, SetLocationLocking locking)
 {
     // FIXME(sky): remove.
@@ skipping 33 matching lines @@
     visitor->trace(m_location);
     visitor->trace(m_media);
     visitor->trace(m_css);
     visitor->trace(m_eventQueue);
     WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor);
     EventTargetWithInlineData::trace(visitor);
     LifecycleContext<LocalDOMWindow>::trace(visitor);
 }
 
 } // namespace blink