diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/notifications/Notification.cpp | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/notifications/Notification.cpp')
| -rw-r--r-- | WebCore/notifications/Notification.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/WebCore/notifications/Notification.cpp b/WebCore/notifications/Notification.cpp index 5908634..3684245 100644 --- a/WebCore/notifications/Notification.cpp +++ b/WebCore/notifications/Notification.cpp @@ -90,8 +90,6 @@ Notification::~Notification() ASSERT_NOT_REACHED(); cancel(); } - if (m_presenter) - m_presenter->notificationObjectDestroyed(this); } void Notification::show() @@ -140,6 +138,12 @@ EventTargetData* Notification::ensureEventTargetData() return &m_eventTargetData; } +void Notification::contextDestroyed() +{ + ActiveDOMObject::contextDestroyed(); + if (m_presenter) + m_presenter->notificationObjectDestroyed(this); +} void Notification::startLoading() { |