1 files changed, 13 insertions, 8 deletions
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp
index f4cf12594..23a140177 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebNotificationClient.cpp
@@ -49,22 +49,22 @@ WebNotificationClient::~WebNotificationClient()
 
 bool WebNotificationClient::show(Notification* notification)
 {
-    return WebProcess::shared().supplement<WebNotificationManager>()->show(notification, m_page);
+    return WebProcess::singleton().supplement<WebNotificationManager>()->show(notification, m_page);
 }
 
 void WebNotificationClient::cancel(Notification* notification)
 {
-    WebProcess::shared().supplement<WebNotificationManager>()->cancel(notification, m_page);
+    WebProcess::singleton().supplement<WebNotificationManager>()->cancel(notification, m_page);
 }
 
 void WebNotificationClient::clearNotifications(ScriptExecutionContext* context)
 {
-    WebProcess::shared().supplement<WebNotificationManager>()->clearNotifications(context, m_page);
+    WebProcess::singleton().supplement<WebNotificationManager>()->clearNotifications(context, m_page);
 }
 
 void WebNotificationClient::notificationObjectDestroyed(Notification* notification)
 {
-    WebProcess::shared().supplement<WebNotificationManager>()->didDestroyNotification(notification, m_page);
+    WebProcess::singleton().supplement<WebNotificationManager>()->didDestroyNotification(notification, m_page);
 }
 
 void WebNotificationClient::notificationControllerDestroyed()
@@ -73,19 +73,24 @@ void WebNotificationClient::notificationControllerDestroyed()
 }
 
 #if ENABLE(LEGACY_NOTIFICATIONS)
-void WebNotificationClient::requestPermission(ScriptExecutionContext* context, PassRefPtr<VoidCallback> callback)
+void WebNotificationClient::requestPermission(ScriptExecutionContext* context, RefPtr<WebCore::VoidCallback>&& callback)
 {
-    m_page->notificationPermissionRequestManager()->startRequest(context->securityOrigin(), callback);
+    m_page->notificationPermissionRequestManager()->startRequest(context->securityOrigin(), WTFMove(callback));
 }
 #endif
 
 #if ENABLE(NOTIFICATIONS)
-void WebNotificationClient::requestPermission(ScriptExecutionContext* context, PassRefPtr<NotificationPermissionCallback> callback)
+void WebNotificationClient::requestPermission(ScriptExecutionContext* context, RefPtr<NotificationPermissionCallback>&& callback)
 {
-    m_page->notificationPermissionRequestManager()->startRequest(context->securityOrigin(), callback);
+    m_page->notificationPermissionRequestManager()->startRequest(context->securityOrigin(), WTFMove(callback));
 }
 #endif
 
+bool WebNotificationClient::hasPendingPermissionRequests(ScriptExecutionContext* context) const
+{
+    return m_page->notificationPermissionRequestManager()->hasPendingPermissionRequests(context->securityOrigin());
+}
+
 void WebNotificationClient::cancelRequestsForPermission(ScriptExecutionContext* context)
 {
     m_page->notificationPermissionRequestManager()->cancelRequest(context->securityOrigin());