Changeset 72601 in webkit

Timestamp:

Nov 23, 2010 6:23:24 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ø.

Rename PermissionDomain to Feature, NotificationsPermissionDomain to Notifications
and GeolocationPermissionDomain to Geolocation.

WebKit/qt:

• Api/qwebpage.cpp:

(QWebPage::setUserPermission):

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

(WebCore::GeolocationPermissionClientQt::requestGeolocationPermissionForFrame):
(WebCore::GeolocationPermissionClientQt::cancelGeolocationPermissionRequestForFrame):

• WebCoreSupport/NotificationPresenterClientQt.cpp:

(WebCore::NotificationPresenterClientQt::requestPermission):
(WebCore::NotificationPresenterClientQt::cancelRequestsForPermission):

• tests/qwebpage/tst_qwebpage.cpp:

(JSTestPage::requestPermission):
(tst_QWebPage::geolocationRequestJS):

WebKitTools:

• DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore::WebPage::WebPage):
(WebCore::WebPage::requestPermission):
(WebCore::WebPage::cancelPermission):
(WebCore::WebPage::permissionSet):
(WebCore::DumpRenderTree::geolocationPermissionSet):

• DumpRenderTree/qt/DumpRenderTreeQt.h:
• DumpRenderTree/qt/LayoutTestControllerQt.cpp:

(LayoutTestController::grantDesktopNotificationPermission):

• QtTestBrowser/webpage.cpp:

(WebPage::WebPage):
(WebPage::requestPermission):
(WebPage::cancelRequestsForPermission):

• QtTestBrowser/webpage.h:

Location:

trunk

Files:

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

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -2112 +2112 @@
 }
 
-void QWebPage::setUserPermission(QWebFrame* frame, PermissionDomain domain, PermissionPolicy policy)
-{
-    switch (domain) {
-    case NotificationsPermissionDomain:
+void QWebPage::setUserPermission(QWebFrame* frame, Feature feature, PermissionPolicy policy)
+{
+    switch (feature) {
+    case Notifications:
 #if ENABLE(NOTIFICATIONS)
         if (policy == PermissionGrantedByUser)
@@ -2121 +2121 @@
 #endif
         break;
-    case GeolocationPermissionDomain:
+    case Geolocation:
 #if ENABLE(GEOLOCATION)
         GeolocationPermissionClientQt::geolocationPermissionClient()->setPermission(frame, policy);

trunk/WebKit/qt/Api/qwebpage.h

@@ -204 +204 @@
     };
 
-    enum PermissionDomain {
-        NotificationsPermissionDomain,
-        GeolocationPermissionDomain
+    enum Feature {
+        Notifications,
+        Geolocation
     };
 
@@ -309 +309 @@
     QMenu *createStandardContextMenu();
 
-    void setUserPermission(QWebFrame* frame, PermissionDomain domain, PermissionPolicy policy);
+    void setUserPermission(QWebFrame* frame, Feature feature, PermissionPolicy policy);
 
     QStringList supportedContentTypes() const;
@@ -394 +394 @@
     void viewportChangeRequested();
 
-    void requestPermissionFromUser(QWebFrame* frame, QWebPage::PermissionDomain domain);
-    void cancelRequestsForPermission(QWebFrame* frame, QWebPage::PermissionDomain domain);
+    void requestPermissionFromUser(QWebFrame* frame, QWebPage::Feature feature);
+    void cancelRequestsForPermission(QWebFrame* frame, QWebPage::Feature feature);
 
 protected:

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
+
+        Rename PermissionDomain to Feature, NotificationsPermissionDomain to Notifications
+        and GeolocationPermissionDomain to Geolocation.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::setUserPermission):
+        * Api/qwebpage.h:
+        * WebCoreSupport/GeolocationPermissionClientQt.cpp:
+        (WebCore::GeolocationPermissionClientQt::requestGeolocationPermissionForFrame):
+        (WebCore::GeolocationPermissionClientQt::cancelGeolocationPermissionRequestForFrame):
+        * WebCoreSupport/NotificationPresenterClientQt.cpp:
+        (WebCore::NotificationPresenterClientQt::requestPermission):
+        (WebCore::NotificationPresenterClientQt::cancelRequestsForPermission):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (JSTestPage::requestPermission):
+        (tst_QWebPage::geolocationRequestJS):
+
 2010-11-23  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp

@@ -66 +66 @@
 
     QWebPage* page = webFrame->page();
-    emit page->requestPermissionFromUser(webFrame, QWebPage::GeolocationPermissionDomain);
+    emit page->requestPermissionFromUser(webFrame, QWebPage::Geolocation);
 }
 
@@ -75 +75 @@
 
     QWebPage* page = webFrame->page();
-    emit page->cancelRequestsForPermission(webFrame, QWebPage::GeolocationPermissionDomain);
+    emit page->cancelRequestsForPermission(webFrame, QWebPage::Geolocation);
 }
 

trunk/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp

@@ -329 +329 @@
         if (toPage(context) && toFrame(context)) {
             m_pendingPermissionRequests.insert(context, info);
-            emit toPage(context)->requestPermissionFromUser(toFrame(context), QWebPage::NotificationsPermissionDomain);
+            emit toPage(context)->requestPermissionFromUser(toFrame(context), QWebPage::Notifications);
         }
     }
@@ -359 +359 @@
         printf("DESKTOP NOTIFICATION PERMISSION REQUEST CANCELLED: %s\n", QString(context->securityOrigin()->toString()).toUtf8().constData());
 
-    emit page->cancelRequestsForPermission(frame, QWebPage::NotificationsPermissionDomain);
+    emit page->cancelRequestsForPermission(frame, QWebPage::Notifications);
 }
 

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

@@ -221 +221 @@
         return true;
     }
-    void requestPermission(QWebFrame* frame, QWebPage::PermissionDomain domain)
+    void requestPermission(QWebFrame* frame, QWebPage::Feature feature)
     {
         if (m_allowGeolocation)
-            setUserPermission(frame, domain, PermissionGrantedByUser);
+            setUserPermission(frame, feature, PermissionGrantedByUser);
         else 
-            setUserPermission(frame, domain, PermissionDeniedByUser);
+            setUserPermission(frame, feature, PermissionDeniedByUser);
     }
 
@@ -257 +257 @@
 
     JSTestPage* newPage = new JSTestPage(m_view);
-    connect(newPage, SIGNAL(requestPermissionFromUser(QWebFrame*, QWebPage::PermissionDomain)), 
-            newPage, SLOT(requestPermission(QWebFrame*, QWebPage::PermissionDomain)));
+    connect(newPage, SIGNAL(requestPermissionFromUser(QWebFrame*, QWebPage::Feature)), 
+            newPage, SLOT(requestPermission(QWebFrame*, QWebPage::Feature)));
 
     newPage->setGeolocationPermission(false);

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
+
+        Rename PermissionDomain to Feature, NotificationsPermissionDomain to Notifications
+        and GeolocationPermissionDomain to Geolocation.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::WebPage):
+        (WebCore::WebPage::requestPermission):
+        (WebCore::WebPage::cancelPermission):
+        (WebCore::WebPage::permissionSet):
+        (WebCore::DumpRenderTree::geolocationPermissionSet):
+        * DumpRenderTree/qt/DumpRenderTreeQt.h:
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::grantDesktopNotificationPermission):
+        * QtTestBrowser/webpage.cpp:
+        (WebPage::WebPage):
+        (WebPage::requestPermission):
+        (WebPage::cancelRequestsForPermission):
+        * QtTestBrowser/webpage.h:
+
 2010-11-23  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -159 +159 @@
     setPluginFactory(new TestPlugin(this));
 
-    connect(this, SIGNAL(requestPermissionFromUser(QWebFrame*, QWebPage::PermissionDomain)), this, SLOT(requestPermission(QWebFrame*, QWebPage::PermissionDomain)));
-    connect(this, SIGNAL(cancelRequestsForPermission(QWebFrame*, QWebPage::PermissionDomain)), this, SLOT(cancelPermission(QWebFrame*, QWebPage::PermissionDomain)));
+    connect(this, SIGNAL(requestPermissionFromUser(QWebFrame*, QWebPage::Feature)), this, SLOT(requestPermission(QWebFrame*, QWebPage::Feature)));
+    connect(this, SIGNAL(cancelRequestsForPermission(QWebFrame*, QWebPage::Feature)), this, SLOT(cancelPermission(QWebFrame*, QWebPage::Feature)));
 }
 
@@ -220 +220 @@
 }
 
-void WebPage::requestPermission(QWebFrame* frame, QWebPage::PermissionDomain domain)
-{
-    switch (domain) {
-    case NotificationsPermissionDomain:
+void WebPage::requestPermission(QWebFrame* frame, QWebPage::Feature feature)
+{
+    switch (feature) {
+    case Notifications:
         if (!m_drt->layoutTestController()->ignoreReqestForPermission())
-            setUserPermission(frame, domain, PermissionGrantedByUser);
+            setUserPermission(frame, feature, PermissionGrantedByUser);
         break;
-    case GeolocationPermissionDomain:
+    case Geolocation:
         if (m_drt->layoutTestController()->isGeolocationPermissionSet())
             if (m_drt->layoutTestController()->geolocationPermission())
-                setUserPermission(frame, domain, PermissionGrantedByUser);
+                setUserPermission(frame, feature, PermissionGrantedByUser);
             else
-                setUserPermission(frame, domain, PermissionDeniedByUser);
+                setUserPermission(frame, feature, PermissionDeniedByUser);
         else
             m_pendingGeolocationRequests.append(frame);
@@ -241 +241 @@
 }
 
-void WebPage::cancelPermission(QWebFrame* frame, QWebPage::PermissionDomain domain)
-{
-    switch (domain) {
-    case GeolocationPermissionDomain:
+void WebPage::cancelPermission(QWebFrame* frame, QWebPage::Feature feature)
+{
+    switch (feature) {
+    case Geolocation:
         m_pendingGeolocationRequests.removeOne(frame);
         break;
@@ -252 +252 @@
 }
 
-void WebPage::permissionSet(QWebPage::PermissionDomain domain)
-{
-    switch (domain) {
-    case GeolocationPermissionDomain:
+void WebPage::permissionSet(QWebPage::Feature feature)
+{
+    switch (feature) {
+    case Geolocation:
         {
         Q_ASSERT(m_drt->layoutTestController()->isGeolocationPermissionSet());
         foreach (QWebFrame* frame, m_pendingGeolocationRequests)
             if (m_drt->layoutTestController()->geolocationPermission())
-                setUserPermission(frame, domain, PermissionGrantedByUser);
+                setUserPermission(frame, feature, PermissionGrantedByUser);
             else
-                setUserPermission(frame, domain, PermissionDeniedByUser);
+                setUserPermission(frame, feature, PermissionDeniedByUser);
 
         m_pendingGeolocationRequests.clear();
@@ -1078 +1078 @@
 void DumpRenderTree::geolocationPermissionSet() 
 {
-    m_page->permissionSet(QWebPage::GeolocationPermissionDomain);
+    m_page->permissionSet(QWebPage::Geolocation);
 }
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h

@@ -195 +195 @@
     QObject* createPlugin(const QString&, const QUrl&, const QStringList&, const QStringList&);
 
-    void permissionSet(QWebPage::PermissionDomain domain);
+    void permissionSet(QWebPage::Feature feature);
 
 public slots:
     bool shouldInterruptJavaScript() { return false; }
-    void requestPermission(QWebFrame* frame, QWebPage::PermissionDomain domain);
-    void cancelPermission(QWebFrame* frame, QWebPage::PermissionDomain domain);
+    void requestPermission(QWebFrame* frame, QWebPage::Feature feature);
+    void cancelPermission(QWebFrame* frame, QWebPage::Feature feature);
 
 protected:

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

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

trunk/WebKitTools/QtTestBrowser/webpage.cpp

@@ -51 +51 @@
     connect(networkAccessManager(), SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
             this, SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*)));
-    connect(this, SIGNAL(requestPermissionFromUser(QWebFrame*, QWebPage::PermissionDomain)), this, SLOT(requestPermission(QWebFrame*, QWebPage::PermissionDomain)));
-    connect(this, SIGNAL(cancelRequestsForPermission(QWebFrame*, QWebPage::PermissionDomain)), this, SLOT(cancelRequestsForPermission(QWebFrame*, QWebPage::PermissionDomain)));
+    connect(this, SIGNAL(requestPermissionFromUser(QWebFrame*, QWebPage::Feature)), this, SLOT(requestPermission(QWebFrame*, QWebPage::Feature)));
+    connect(this, SIGNAL(cancelRequestsForPermission(QWebFrame*, QWebPage::Feature)), this, SLOT(cancelRequestsForPermission(QWebFrame*, QWebPage::Feature)));
 }
 
@@ -168 +168 @@
 }
 
-void WebPage::requestPermission(QWebFrame* frame, QWebPage::PermissionDomain domain)
-{
-    setUserPermission(frame, domain, PermissionGrantedByUser);
-}
-
-void WebPage::cancelRequestsForPermission(QWebFrame*, QWebPage::PermissionDomain)
+void WebPage::requestPermission(QWebFrame* frame, QWebPage::Feature feature)
+{
+    setUserPermission(frame, feature, PermissionGrantedByUser);
+}
+
+void WebPage::cancelRequestsForPermission(QWebFrame*, QWebPage::Feature)
 {
 }

trunk/WebKitTools/QtTestBrowser/webpage.h

@@ -58 +58 @@
     bool shouldInterruptJavaScript();
     void authenticationRequired(QNetworkReply*, QAuthenticator*);
-    void requestPermission(QWebFrame* frame, QWebPage::PermissionDomain domain);
-    void cancelRequestsForPermission(QWebFrame* frame, QWebPage::PermissionDomain domain);
+    void requestPermission(QWebFrame* frame, QWebPage::Feature feature);
+    void cancelRequestsForPermission(QWebFrame* frame, QWebPage::Feature feature);
 
 private: