From 748416c65216f625cca7f50ada580d1e822190c7 Mon Sep 17 00:00:00 2001 From: "jonlee@apple.com" Date: Thu, 19 Jan 2012 01:44:29 +0000 Subject: [PATCH] Build fix for r105364. Unreviewed. * WebProcess/Notifications/WebNotificationManager.cpp: Wrap methods in #if ENABLE(NOTIFICATIONS) (WebKit::WebNotificationManager::initialize): (WebKit::WebNotificationManager::didUpdateNotificationDecision): (WebKit::WebNotificationManager::didRemoveNotificationDecisions): (WebKit::WebNotificationManager::policyForOrigin): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105367 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 10 ++++++++++ .../WebProcess/Notifications/WebNotificationManager.cpp | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index b99c91c..9820bc4 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,5 +1,15 @@ 2012-01-18 Jon Lee + Build fix for r105364. Unreviewed. + + * WebProcess/Notifications/WebNotificationManager.cpp: Wrap methods in #if ENABLE(NOTIFICATIONS) + (WebKit::WebNotificationManager::initialize): + (WebKit::WebNotificationManager::didUpdateNotificationDecision): + (WebKit::WebNotificationManager::didRemoveNotificationDecisions): + (WebKit::WebNotificationManager::policyForOrigin): + +2012-01-18 Jon Lee + [WK2] Sync call for notifications permissions causes flashes on gmail.com https://bugs.webkit.org/show_bug.cgi?id=76570 diff --git a/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp b/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp index e7f0c15..0c86529 100644 --- a/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp +++ b/Source/WebKit2/WebProcess/Notifications/WebNotificationManager.cpp @@ -68,29 +68,37 @@ void WebNotificationManager::didReceiveMessage(CoreIPC::Connection* connection, void WebNotificationManager::initialize(const HashMap& permissions) { +#if ENABLE(NOTIFICATIONS) m_permissionsMap = permissions; +#endif } void WebNotificationManager::didUpdateNotificationDecision(const String& originString, bool allowed) { +#if ENABLE(NOTIFICATIONS) m_permissionsMap.set(originString, allowed); +#endif } void WebNotificationManager::didRemoveNotificationDecisions(const Vector& originStrings) { +#if ENABLE(NOTIFICATIONS) size_t count = originStrings.size(); for (size_t i = 0; i < count; ++i) m_permissionsMap.remove(originStrings[i]); +#endif } NotificationPresenter::Permission WebNotificationManager::policyForOrigin(WebCore::SecurityOrigin *origin) const { +#if ENABLE(NOTIFICATIONS) if (!origin) return NotificationPresenter::PermissionNotAllowed; HashMap::const_iterator it = m_permissionsMap.find(origin->toString()); if (it != m_permissionsMap.end()) return it->second ? NotificationPresenter::PermissionAllowed : NotificationPresenter::PermissionDenied; +#endif return NotificationPresenter::PermissionNotAllowed; } -- 2.7.4