[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d0ed35147005a404b5a742be538d860f10e02a11
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 23 14:23:46 2010 +0000

    [Qt] Review the setUserPermission & friends API
    https://bugs.webkit.org/show_bug.cgi?id=46810
    
    Reviewed by Tor Arne Vestbø.
    
    Rename setUserPermission to setFeaturePermission
    
    WebKit/qt:
    
    * Api/qwebpage.cpp:
    (QWebPage::setFeaturePermission):
    * Api/qwebpage.h:
    * 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72602 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index d9288f2..e00b4c6 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -2111,7 +2111,7 @@ bool QWebPage::shouldInterruptJavaScript()
 #endif
 }
 
-void QWebPage::setUserPermission(QWebFrame* frame, Feature feature, PermissionPolicy policy)
+void QWebPage::setFeaturePermission(QWebFrame* frame, Feature feature, PermissionPolicy policy)
 {
     switch (feature) {
     case Notifications:
diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index e4c1da2..817fa3f 100644
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -308,7 +308,7 @@ public:
 
     QMenu *createStandardContextMenu();
 
-    void setUserPermission(QWebFrame* frame, Feature feature, PermissionPolicy policy);
+    void setFeaturePermission(QWebFrame* frame, Feature feature, PermissionPolicy policy);
 
     QStringList supportedContentTypes() const;
     bool supportsContentType(const QString& mimeType) const;
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 9f3560f..4f5a4ad 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -5,6 +5,21 @@
         [Qt] Review the setUserPermission & friends API
         https://bugs.webkit.org/show_bug.cgi?id=46810
 
+        Rename setUserPermission to setFeaturePermission
+
+        * Api/qwebpage.cpp:
+        (QWebPage::setFeaturePermission):
+        * Api/qwebpage.h:
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (JSTestPage::requestPermission):
+
+2010-11-23  Simon Hausmann  <simon.hausmann at 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.
 
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index c78587d..27a36c3 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -223,9 +223,9 @@ public slots:
     void requestPermission(QWebFrame* frame, QWebPage::Feature feature)
     {
         if (m_allowGeolocation)
-            setUserPermission(frame, feature, PermissionGrantedByUser);
+            setFeaturePermission(frame, feature, PermissionGrantedByUser);
         else 
-            setUserPermission(frame, feature, PermissionDeniedByUser);
+            setFeaturePermission(frame, feature, PermissionDeniedByUser);
     }
 
 public:
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 80d3457..0a845cb 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -5,6 +5,23 @@
         [Qt] Review the setUserPermission & friends API
         https://bugs.webkit.org/show_bug.cgi?id=46810
 
+        Rename setUserPermission to setFeaturePermission
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::requestPermission):
+        (WebCore::WebPage::permissionSet):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::grantDesktopNotificationPermission):
+        * QtTestBrowser/webpage.cpp:
+        (WebPage::requestPermission):
+
+2010-11-23  Simon Hausmann  <simon.hausmann at 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.
 
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index f82626e..f2ccc59 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -224,14 +224,14 @@ void WebPage::requestPermission(QWebFrame* frame, QWebPage::Feature feature)
     switch (feature) {
     case Notifications:
         if (!m_drt->layoutTestController()->ignoreReqestForPermission())
-            setUserPermission(frame, feature, PermissionGrantedByUser);
+            setFeaturePermission(frame, feature, PermissionGrantedByUser);
         break;
     case Geolocation:
         if (m_drt->layoutTestController()->isGeolocationPermissionSet())
             if (m_drt->layoutTestController()->geolocationPermission())
-                setUserPermission(frame, feature, PermissionGrantedByUser);
+                setFeaturePermission(frame, feature, PermissionGrantedByUser);
             else
-                setUserPermission(frame, feature, PermissionDeniedByUser);
+                setFeaturePermission(frame, feature, PermissionDeniedByUser);
         else
             m_pendingGeolocationRequests.append(frame);
         break;
@@ -259,9 +259,9 @@ void WebPage::permissionSet(QWebPage::Feature feature)
         Q_ASSERT(m_drt->layoutTestController()->isGeolocationPermissionSet());
         foreach (QWebFrame* frame, m_pendingGeolocationRequests)
             if (m_drt->layoutTestController()->geolocationPermission())
-                setUserPermission(frame, feature, PermissionGrantedByUser);
+                setFeaturePermission(frame, feature, PermissionGrantedByUser);
             else
-                setUserPermission(frame, feature, PermissionDeniedByUser);
+                setFeaturePermission(frame, feature, PermissionDeniedByUser);
 
         m_pendingGeolocationRequests.clear();
         break;
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 7a1bd9d..0f5f6e1 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -198,7 +198,7 @@ int LayoutTestController::windowCount()
 void LayoutTestController::grantDesktopNotificationPermission(const QString& origin)
 {
     QWebFrame* frame = m_drt->webPage()->mainFrame();
-    m_drt->webPage()->setUserPermission(frame, QWebPage::Notifications, QWebPage::PermissionGrantedByUser);
+    m_drt->webPage()->setFeaturePermission(frame, QWebPage::Notifications, QWebPage::PermissionGrantedByUser);
     m_desktopNotificationAllowedOrigins.append(origin);
 }
 
diff --git a/WebKitTools/QtTestBrowser/webpage.cpp b/WebKitTools/QtTestBrowser/webpage.cpp
index 555467c..319494d 100644
--- a/WebKitTools/QtTestBrowser/webpage.cpp
+++ b/WebKitTools/QtTestBrowser/webpage.cpp
@@ -169,7 +169,7 @@ void WebPage::authenticationRequired(QNetworkReply* reply, QAuthenticator* authe
 
 void WebPage::requestPermission(QWebFrame* frame, QWebPage::Feature feature)
 {
-    setUserPermission(frame, feature, PermissionGrantedByUser);
+    setFeaturePermission(frame, feature, PermissionGrantedByUser);
 }
 
 void WebPage::cancelRequestsForPermission(QWebFrame*, QWebPage::Feature)

-- 
WebKit Debian packaging