Changeset 72600 in webkit

Timestamp:

Nov 23, 2010 6:22:59 AM (13 years ago)

Author:

Simon Hausmann

Message:

[Qt] Review the setUserPermission & friends API
​https://bugs.webkit.org/show_bug.cgi?id=46810

Reviewed by Tor Arne Vestbø.

Add a ByUser suffix to PermissionGranted/Denied. In the future
we can add PermissionGrantedByDefault.

WebKit/qt:

• Api/qwebpage.cpp:

(QWebPage::setUserPermission):

• Api/qwebpage.h:
• WebCoreSupport/GeolocationPermissionClientQt.cpp:

(WebCore::GeolocationPermissionClientQt::setPermission):

• tests/qwebpage/tst_qwebpage.cpp:

(JSTestPage::requestPermission):

WebKitTools:

• DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore::WebPage::requestPermission):
(WebCore::WebPage::permissionSet):

• DumpRenderTree/qt/LayoutTestControllerQt.cpp:

(LayoutTestController::grantDesktopNotificationPermission):

• QtTestBrowser/webpage.cpp:

(WebPage::requestPermission):

Location:

trunk

Files:

• WebKit/qt/Api/qwebpage.cpp (modified) (1 diff)
• WebKit/qt/Api/qwebpage.h (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp (modified) (1 diff)
• WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (2 diffs)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (1 diff)
• WebKitTools/QtTestBrowser/webpage.cpp (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -2117 +2117 @@
     case NotificationsPermissionDomain:
 #if ENABLE(NOTIFICATIONS)
-        if (policy == PermissionGranted)
+        if (policy == PermissionGrantedByUser)
             NotificationPresenterClientQt::notificationPresenter()->allowNotificationForFrame(frame->d->frame);
 #endif

trunk/WebKit/qt/Api/qwebpage.h

@@ -199 +199 @@
 
     enum PermissionPolicy {
-        PermissionGranted,
         PermissionUnknown,
-        PermissionDenied
+        PermissionGrantedByUser,
+        PermissionDeniedByUser
     };
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-11-23  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Review the setUserPermission & friends API
+        https://bugs.webkit.org/show_bug.cgi?id=46810
+
+        Add a ByUser suffix to PermissionGranted/Denied. In the future
+        we can add PermissionGrantedByDefault.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::setUserPermission):
+        * Api/qwebpage.h:
+        * WebCoreSupport/GeolocationPermissionClientQt.cpp:
+        (WebCore::GeolocationPermissionClientQt::setPermission):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (JSTestPage::requestPermission):
+
 2010-11-22  Jan Erik Hanssen  <jhanssen@sencha.com>
 

trunk/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp

@@ -85 +85 @@
     Geolocation* listener = m_pendingPermissionRequests.value(webFrame);
 
-    if (permission == QWebPage::PermissionGranted)
+    if (permission == QWebPage::PermissionGrantedByUser)
         listener->setIsAllowed(true);
-    else if (permission == QWebPage::PermissionDenied)
+    else if (permission == QWebPage::PermissionDeniedByUser)
         listener->setIsAllowed(false);
     else

trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -224 +224 @@
     {
         if (m_allowGeolocation)
-            setUserPermission(frame, domain, PermissionGranted);
+            setUserPermission(frame, domain, PermissionGrantedByUser);
         else 
-            setUserPermission(frame, domain, PermissionDenied);
+            setUserPermission(frame, domain, PermissionDeniedByUser);
     }
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-11-23  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Review the setUserPermission & friends API
+        https://bugs.webkit.org/show_bug.cgi?id=46810
+
+        Add a ByUser suffix to PermissionGranted/Denied. In the future
+        we can add PermissionGrantedByDefault.
+
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::requestPermission):
+        (WebCore::WebPage::permissionSet):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::grantDesktopNotificationPermission):
+        * QtTestBrowser/webpage.cpp:
+        (WebPage::requestPermission):
+
 2010-11-18  Satish Sampath  <satish@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -225 +225 @@
     case NotificationsPermissionDomain:
         if (!m_drt->layoutTestController()->ignoreReqestForPermission())
-            setUserPermission(frame, domain, PermissionGranted);
+            setUserPermission(frame, domain, PermissionGrantedByUser);
         break;
     case GeolocationPermissionDomain:
         if (m_drt->layoutTestController()->isGeolocationPermissionSet())
             if (m_drt->layoutTestController()->geolocationPermission())
-                setUserPermission(frame, domain, PermissionGranted);
+                setUserPermission(frame, domain, PermissionGrantedByUser);
             else
-                setUserPermission(frame, domain, PermissionDenied);
+                setUserPermission(frame, domain, PermissionDeniedByUser);
         else
             m_pendingGeolocationRequests.append(frame);
@@ -260 +260 @@
         foreach (QWebFrame* frame, m_pendingGeolocationRequests)
             if (m_drt->layoutTestController()->geolocationPermission())
-                setUserPermission(frame, domain, PermissionGranted);
+                setUserPermission(frame, domain, PermissionGrantedByUser);
             else
-                setUserPermission(frame, domain, PermissionDenied);
+                setUserPermission(frame, domain, PermissionDeniedByUser);
 
         m_pendingGeolocationRequests.clear();

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -199 +199 @@
 {
     QWebFrame* frame = m_drt->webPage()->mainFrame();
-    m_drt->webPage()->setUserPermission(frame, QWebPage::NotificationsPermissionDomain, QWebPage::PermissionGranted);
+    m_drt->webPage()->setUserPermission(frame, QWebPage::NotificationsPermissionDomain, QWebPage::PermissionGrantedByUser);
     m_desktopNotificationAllowedOrigins.append(origin);
 }

trunk/WebKitTools/QtTestBrowser/webpage.cpp

@@ -170 +170 @@
 void WebPage::requestPermission(QWebFrame* frame, QWebPage::PermissionDomain domain)
 {
-    setUserPermission(frame, domain, PermissionGranted);
+    setUserPermission(frame, domain, PermissionGrantedByUser);
 }