Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Unified Diff: Source/WebCore/notifications/NotificationCenter.cpp

Issue 8333006: Merge 97667 - Re-landing: window.webkitNotifications uses deallocated NotificationPresenter after... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/WebCore/page/DOMWindow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/notifications/NotificationCenter.cpp
===================================================================
--- Source/WebCore/notifications/NotificationCenter.cpp (revision 97673)
+++ Source/WebCore/notifications/NotificationCenter.cpp (working copy)
@@ -61,9 +61,8 @@
void NotificationCenter::disconnectFrame()
{
- // m_notificationPresenter should never be 0. But just to be safe, we check it here.
- // Due to the mysterious bug http://code.google.com/p/chromium/issues/detail?id=49323.
- ASSERT(m_notificationPresenter);
+ // Can be 0 if iframe was transferred into another page. In this case
+ // this method is invoked more then once.
if (!m_notificationPresenter)
return;
m_notificationPresenter->cancelRequestsForPermission(scriptExecutionContext());
« no previous file with comments | « no previous file | Source/WebCore/page/DOMWindow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698