diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
| commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
| tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebCore/notifications | |
| parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
| download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 | |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebCore/notifications')
| -rw-r--r-- | WebCore/notifications/NotificationCenter.cpp | 1 | ||||
| -rw-r--r-- | WebCore/notifications/NotificationPresenter.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/notifications/NotificationCenter.cpp b/WebCore/notifications/NotificationCenter.cpp index ec70f0a..a2289ec 100644 --- a/WebCore/notifications/NotificationCenter.cpp +++ b/WebCore/notifications/NotificationCenter.cpp @@ -68,6 +68,7 @@ void NotificationCenter::disconnectFrame() return; m_notificationPresenter->cancelRequestsForPermission(m_scriptExecutionContext); m_notificationPresenter = 0; + m_scriptExecutionContext = 0; } } // namespace WebCore diff --git a/WebCore/notifications/NotificationPresenter.h b/WebCore/notifications/NotificationPresenter.h index e3e7ee2..9602199 100644 --- a/WebCore/notifications/NotificationPresenter.h +++ b/WebCore/notifications/NotificationPresenter.h @@ -42,7 +42,6 @@ namespace WebCore { class Notification; class KURL; class ScriptExecutionContext; - class String; class NotificationPresenter { |