Merge 97667 - Re-landing: window.webkitNotifications uses deallocated NotificationPresenter after...

Source/WebCore/page/Frame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 729 matching lines @@
             if (m_page->focusController()->focusedFrame() == this)
                 m_page->focusController()->setFocusedFrame(0);
 
              m_page->decrementFrameCount();
         }
 
         // FIXME: We should ideally allow existing Geolocation activities to continue
         // when the Geolocation's iframe is reparented.
         // See https://bugs.webkit.org/show_bug.cgi?id=55577
         // and https://bugs.webkit.org/show_bug.cgi?id=52877
-        if (m_domWindow)
+        if (m_domWindow) {
             m_domWindow->resetGeolocation();
+#if ENABLE(NOTIFICATIONS)
+            m_domWindow->resetNotifications();
+#endif
+        }
 
 #if ENABLE(MEDIA_STREAM)
         if (m_mediaStreamFrameController)
             m_mediaStreamFrameController->transferToNewPage(newPage);
 #endif
         m_page = newPage;
 
         if (newPage)
             newPage->incrementFrameCount();
 
@@ skipping 308 matching lines @@
     unsigned count = 0;
     for (const Frame* frame = this; frame; frame = frame->tree()->traverseNext()) {
         if (frame->document())
             count += frame->document()->wheelEventHandlerCount();
     }
     
     m_page->chrome()->client()->numWheelEventHandlersChanged(count);
 }
 
 } // namespace WebCore