diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp b/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp index fb42bcc43..35070e144 100644 --- a/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp +++ b/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp @@ -31,6 +31,7 @@ #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) #include "WebNotification.h" +#include "WebNotificationManagerMessages.h" #include "WebNotificationManagerProxyMessages.h" #include "WebPageProxyMessages.h" #include <WebCore/Document.h> @@ -57,6 +58,9 @@ static uint64_t generateNotificationID() WebNotificationManager::WebNotificationManager(WebProcess* process) : m_process(process) { +#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) + m_process->addMessageReceiver(Messages::WebNotificationManager::messageReceiverName(), this); +#endif } WebNotificationManager::~WebNotificationManager() @@ -170,7 +174,7 @@ void WebNotificationManager::cancel(Notification* notification, WebPage* page) if (!notificationID) return; - m_process->connection()->send(Messages::WebNotificationManagerProxy::Cancel(notificationID), page->pageID()); + m_process->connection()->send(Messages::WebNotificationManagerProxy::Cancel(notificationID), 0); #else UNUSED_PARAM(notification); UNUSED_PARAM(page); @@ -185,7 +189,7 @@ void WebNotificationManager::clearNotifications(WebCore::ScriptExecutionContext* return; Vector<uint64_t>& notificationIDs = it->value; - m_process->connection()->send(Messages::WebNotificationManagerProxy::ClearNotifications(notificationIDs), page->pageID()); + m_process->connection()->send(Messages::WebNotificationManagerProxy::ClearNotifications(notificationIDs), 0); size_t count = notificationIDs.size(); for (size_t i = 0; i < count; ++i) { RefPtr<Notification> notification = m_notificationIDMap.take(notificationIDs[i]); @@ -211,7 +215,7 @@ void WebNotificationManager::didDestroyNotification(Notification* notification, m_notificationIDMap.remove(notificationID); removeNotificationFromContextMap(notificationID, notification); - m_process->connection()->send(Messages::WebNotificationManagerProxy::DidDestroyNotification(notificationID), page->pageID()); + m_process->connection()->send(Messages::WebNotificationManagerProxy::DidDestroyNotification(notificationID), 0); #else UNUSED_PARAM(notification); UNUSED_PARAM(page); |