Changeset 72603 in webkit

Timestamp:

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

Renamed requestPermissionFromUser to featurePermissionRequested
and cancelRequestsForPermission to featurePermissionRequestCanceled.

WebKit/qt:

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

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

• WebCoreSupport/NotificationPresenterClientQt.cpp:

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

WebKitTools:

• DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore::WebPage::WebPage):

• QtTestBrowser/webpage.cpp:

(WebPage::WebPage):
(WebPage::featurePermissionRequestCanceled):

• QtTestBrowser/webpage.h:

Location:

trunk

Files:

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

trunk/WebKit/qt/Api/qwebpage.h

@@ -394 +394 @@
     void viewportChangeRequested();
 
-    void requestPermissionFromUser(QWebFrame* frame, QWebPage::Feature feature);
-    void cancelRequestsForPermission(QWebFrame* frame, QWebPage::Feature feature);
+    void featurePermissionRequested(QWebFrame* frame, QWebPage::Feature feature);
+    void featurePermissionRequestCanceled(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
+
+        Renamed requestPermissionFromUser to featurePermissionRequested
+        and cancelRequestsForPermission to featurePermissionRequestCanceled.
+
+        * Api/qwebpage.h:
+        * WebCoreSupport/GeolocationPermissionClientQt.cpp:
+        (WebCore::GeolocationPermissionClientQt::requestGeolocationPermissionForFrame):
+        (WebCore::GeolocationPermissionClientQt::cancelGeolocationPermissionRequestForFrame):
+        * WebCoreSupport/NotificationPresenterClientQt.cpp:
+        (WebCore::NotificationPresenterClientQt::requestPermission):
+        (WebCore::NotificationPresenterClientQt::cancelRequestsForPermission):
+
 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::Geolocation);
+    emit page->featurePermissionRequested(webFrame, QWebPage::Geolocation);
 }
 
@@ -75 +75 @@
 
     QWebPage* page = webFrame->page();
-    emit page->cancelRequestsForPermission(webFrame, QWebPage::Geolocation);
+    emit page->featurePermissionRequestCanceled(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::Notifications);
+            emit toPage(context)->featurePermissionRequested(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::Notifications);
+    emit page->featurePermissionRequestCanceled(frame, QWebPage::Notifications);
 }
 

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
+
+        Renamed requestPermissionFromUser to featurePermissionRequested
+        and cancelRequestsForPermission to featurePermissionRequestCanceled.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::WebPage):
+        * QtTestBrowser/webpage.cpp:
+        (WebPage::WebPage):
+        (WebPage::featurePermissionRequestCanceled):
+        * 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::Feature)), this, SLOT(requestPermission(QWebFrame*, QWebPage::Feature)));
-    connect(this, SIGNAL(cancelRequestsForPermission(QWebFrame*, QWebPage::Feature)), this, SLOT(cancelPermission(QWebFrame*, QWebPage::Feature)));
+    connect(this, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)), this, SLOT(requestPermission(QWebFrame*, QWebPage::Feature)));
+    connect(this, SIGNAL(featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature)), this, SLOT(cancelPermission(QWebFrame*, QWebPage::Feature)));
 }
 

trunk/WebKitTools/QtTestBrowser/webpage.cpp

@@ -51 +51 @@
     connect(networkAccessManager(), SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
             this, SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*)));
-    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)));
+    connect(this, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)), this, SLOT(requestPermission(QWebFrame*, QWebPage::Feature)));
+    connect(this, SIGNAL(featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature)), this, SLOT(featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature)));
 }
 
@@ -173 +173 @@
 }
 
-void WebPage::cancelRequestsForPermission(QWebFrame*, QWebPage::Feature)
+void WebPage::featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature)
 {
 }

trunk/WebKitTools/QtTestBrowser/webpage.h

@@ -59 +59 @@
     void authenticationRequired(QNetworkReply*, QAuthenticator*);
     void requestPermission(QWebFrame* frame, QWebPage::Feature feature);
-    void cancelRequestsForPermission(QWebFrame* frame, QWebPage::Feature feature);
+    void featurePermissionRequestCanceled(QWebFrame* frame, QWebPage::Feature feature);
 
 private: