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

Source/WebCore/page/DOMWindow.cpp

Index: Source/WebCore/page/DOMWindow.cpp
===================================================================
--- Source/WebCore/page/DOMWindow.cpp	(revision 97673)
+++ Source/WebCore/page/DOMWindow.cpp	(working copy)
@@ -548,9 +548,7 @@
 #endif
 
 #if ENABLE(NOTIFICATIONS)
-    if (m_notifications)
-        m_notifications->disconnectFrame();
-    m_notifications = 0;
+    resetNotifications();
 #endif
 
 #if ENABLE(INDEXED_DATABASE)
@@ -758,6 +756,14 @@
       
     return m_notifications.get();
 }
+
+void DOMWindow::resetNotifications()
+{
+    if (!m_notifications)
+        return;
+    m_notifications->disconnectFrame();
+    m_notifications = 0;
+}
 #endif
 
 void DOMWindow::pageDestroyed()
@@ -766,9 +772,7 @@
 #if ENABLE(NOTIFICATIONS)
     // Clearing Notifications requests involves accessing the client so it must be done
     // before the frame is detached.
-    if (m_notifications)
-        m_notifications->disconnectFrame();
-    m_notifications = 0;
+    resetNotifications();
 #endif
 }