Changeset 141233 in webkit

Timestamp:

Jan 30, 2013 1:28:19 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt][WK1] Remember denied permission for notifications
​https://bugs.webkit.org/show_bug.cgi?id=107694

Reviewed by Jocelyn Turcotte.

Store denied permissions. According to the specification, we should
ask the user again if he has already granted or denied permission.

• WebCoreSupport/NotificationPresenterClientQt.cpp:

(WebCore::NotificationPresenterClientQt::requestPermission):
(WebCore::NotificationPresenterClientQt::setNotificationsAllowedForFrame):

• WebCoreSupport/NotificationPresenterClientQt.h:

(NotificationPresenterClientQt):

• WebCoreSupport/QWebPageAdapter.cpp:

(QWebPageAdapter::setNotificationsAllowedForFrame):

• WebCoreSupport/QWebPageAdapter.h:
• WidgetApi/qwebpage.cpp:

(QWebPage::setFeaturePermission):

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/NotificationPresenterClientQt.cpp (modified) (4 diffs)
• WebCoreSupport/NotificationPresenterClientQt.h (modified) (1 diff)
• WebCoreSupport/QWebPageAdapter.cpp (modified) (1 diff)
• WebCoreSupport/QWebPageAdapter.h (modified) (1 diff)
• WidgetApi/qwebpage.cpp (modified) (1 diff)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2013-01-30  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt][WK1] Remember denied permission for notifications 
+        https://bugs.webkit.org/show_bug.cgi?id=107694
+
+        Reviewed by Jocelyn Turcotte.
+
+        Store denied permissions. According to the specification, we should
+        ask the user again if he has already granted or denied permission.
+
+        * WebCoreSupport/NotificationPresenterClientQt.cpp:
+        (WebCore::NotificationPresenterClientQt::requestPermission):
+        (WebCore::NotificationPresenterClientQt::setNotificationsAllowedForFrame):
+        * WebCoreSupport/NotificationPresenterClientQt.h:
+        (NotificationPresenterClientQt):
+        * WebCoreSupport/QWebPageAdapter.cpp:
+        (QWebPageAdapter::setNotificationsAllowedForFrame):
+        * WebCoreSupport/QWebPageAdapter.h:
+        * WidgetApi/qwebpage.cpp:
+        (QWebPage::setFeaturePermission):
+
 2013-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp

@@ -311 +311 @@
         printf("DESKTOP NOTIFICATION PERMISSION REQUESTED: %s\n", QString(context->securityOrigin()->toString()).toUtf8().constData());
 
+    NotificationClient::Permission permission = checkPermission(context);
+    if (permission != NotificationClient::PermissionNotAllowed) {
+        if (callback)
+            callback->handleEvent();
+        return;
+    }
+
     QHash<ScriptExecutionContext*, CallbacksInfo >::iterator iter = m_pendingPermissionRequests.find(context);
     if (iter != m_pendingPermissionRequests.end())
@@ -334 +341 @@
         printf("DESKTOP NOTIFICATION PERMISSION REQUESTED: %s\n", QString(context->securityOrigin()->toString()).toUtf8().constData());
 
+    NotificationClient::Permission permission = checkPermission(context);
+    if (permission != NotificationClient::PermissionNotAllowed) {
+        if (callback)
+            callback->handleEvent(Notification::permissionString(permission));
+        return;
+    }
+
     QHash<ScriptExecutionContext*, CallbacksInfo >::iterator iter = m_pendingPermissionRequests.find(context);
     if (iter != m_pendingPermissionRequests.end())
@@ -379 +393 @@
 }
 
-void NotificationPresenterClientQt::allowNotificationForFrame(Frame* frame)
-{
-    m_cachedPermissions.insert(frame->document(), NotificationClient::PermissionAllowed);
+void NotificationPresenterClientQt::setNotificationsAllowedForFrame(Frame* frame, bool allowed)
+{
+    ASSERT(frame->document());
+    if (!frame->document())
+        return;
+
+    NotificationClient::Permission permission = allowed ? NotificationClient::PermissionAllowed : NotificationClient::PermissionDenied;
+    m_cachedPermissions.insert(frame->document(), permission);
 
     QHash<ScriptExecutionContext*,  CallbacksInfo>::iterator iter = m_pendingPermissionRequests.begin();
@@ -403 +422 @@
     Q_FOREACH(const RefPtr<NotificationPermissionCallback>& callback, callbacks) {
         if (callback)
-            callback->handleEvent(Notification::permissionString(NotificationClient::PermissionAllowed));
+            callback->handleEvent(Notification::permissionString(permission));
     }
 #endif

trunk/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h

@@ -102 +102 @@
     void cancel(NotificationWrapper*);
 
-    void allowNotificationForFrame(Frame*);
+    void setNotificationsAllowedForFrame(Frame*, bool allowed);
 
     static bool dumpNotification;

trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp

@@ -1229 +1229 @@
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-void QWebPageAdapter::allowNotificationsForFrame(QWebFrameAdapter* frame)
-{
-    NotificationPresenterClientQt::notificationPresenter()->allowNotificationForFrame(frame->frame);
+void QWebPageAdapter::setNotificationsAllowedForFrame(QWebFrameAdapter* frame, bool allowed)
+{
+    NotificationPresenterClientQt::notificationPresenter()->setNotificationsAllowedForFrame(frame->frame, allowed);
 }
 

trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h

@@ -313 +313 @@
 #endif
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-    void allowNotificationsForFrame(QWebFrameAdapter*);
+    void setNotificationsAllowedForFrame(QWebFrameAdapter*, bool allowed);
     void addNotificationPresenterClient();
 #ifndef QT_NO_SYSTEMTRAYICON

trunk/Source/WebKit/qt/WidgetApi/qwebpage.cpp

@@ -1585 +1585 @@
 void QWebPage::setFeaturePermission(QWebFrame* frame, Feature feature, PermissionPolicy policy)
 {
+#if !ENABLE(NOTIFICATIONS) && !ENABLE(LEGACY_NOTIFICATIONS) && !ENABLE(GEOLOCATION)
+    Q_UNUSED(frame);
+    Q_UNUSED(policy);
+#endif
     switch (feature) {
     case Notifications:
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
-        if (policy == PermissionGrantedByUser)
-            d->allowNotificationsForFrame(frame->d);
+        if (policy != PermissionUnknown)
+            d->setNotificationsAllowedForFrame(frame->d, (policy == PermissionGrantedByUser));
 #endif
         break;