diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
| commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
| tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebCore/notifications | |
| parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
| download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 | |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebCore/notifications')
| -rw-r--r-- | WebCore/notifications/NotificationCenter.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/notifications/NotificationCenter.cpp b/WebCore/notifications/NotificationCenter.cpp index f9672ad..ec70f0a 100644 --- a/WebCore/notifications/NotificationCenter.cpp +++ b/WebCore/notifications/NotificationCenter.cpp @@ -61,6 +61,11 @@ void NotificationCenter::requestPermission(PassRefPtr<VoidCallback> callback) 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); + if (!m_notificationPresenter) + return; m_notificationPresenter->cancelRequestsForPermission(m_scriptExecutionContext); m_notificationPresenter = 0; } |