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

Source/WebCore/page/DOMWindow.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 530 matching lines @@
     m_localStorage = 0;
 #endif
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     if (m_applicationCache)
         m_applicationCache->disconnectFrame();
     m_applicationCache = 0;
 #endif
 
 #if ENABLE(NOTIFICATIONS)
-    if (m_notifications)
-        m_notifications->disconnectFrame();
-    m_notifications = 0;
+    resetNotifications();
 #endif
 
 #if ENABLE(INDEXED_DATABASE)
     m_idbFactory = 0;
 #endif
 
 #if ENABLE(BLOB)
     m_domURL = 0;
 #endif
 
@@ skipping 187 matching lines @@
     Page* page = document->page();
     if (!page)
         return 0;
 
     NotificationPresenter* provider = page->chrome()->notificationPresenter();
     if (provider) 
         m_notifications = NotificationCenter::create(document, provider);    
       
     return m_notifications.get();
 }
+
+void DOMWindow::resetNotifications()
+{
+    if (!m_notifications)
+        return;
+    m_notifications->disconnectFrame();
+    m_notifications = 0;
+}
 #endif
 
 void DOMWindow::pageDestroyed()
 {
     InspectorInstrumentation::frameWindowDiscarded(m_frame, this);
 #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
 }
 
 void DOMWindow::resetGeolocation()
 {
     // Geolocation should cancel activities and permission requests when the page is detached.
     if (m_navigator)
         m_navigator->resetGeolocation();
 }
 
@@ skipping 1156 matching lines @@
 #if ENABLE(QUOTA)
 StorageInfo* DOMWindow::webkitStorageInfo() const
 {
     if (!m_storageInfo && isCurrentlyDisplayedInFrame())
         m_storageInfo = StorageInfo::create();
     return m_storageInfo.get();
 }
 #endif
 
 } // namespace WebCore