diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
| commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
| tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp | |
| parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
| parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
| download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz | |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp b/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp index 6423ff64a..3e7421a1e 100644 --- a/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp +++ b/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp @@ -64,7 +64,7 @@ WebNotificationManager::WebNotificationManager(WebProcess* process) : m_process(process) { #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) - m_process->addMessageReceiver(Messages::WebNotificationManager::messageReceiverName(), this); + m_process->addMessageReceiver(Messages::WebNotificationManager::messageReceiverName(), *this); #endif } @@ -141,7 +141,7 @@ uint64_t WebNotificationManager::notificationIDForTesting(Notification* notifica bool WebNotificationManager::show(Notification* notification, WebPage* page) { #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) - if (!notification || !page->corePage()->settings()->notificationsEnabled()) + if (!notification || !page->corePage()->settings().notificationsEnabled()) return false; uint64_t notificationID = generateNotificationID(); @@ -167,7 +167,7 @@ bool WebNotificationManager::show(Notification* notification, WebPage* page) void WebNotificationManager::cancel(Notification* notification, WebPage* page) { #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) - if (!notification || !page->corePage()->settings()->notificationsEnabled()) + if (!notification || !page->corePage()->settings().notificationsEnabled()) return; uint64_t notificationID = m_notificationMap.get(notification); |