[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hausmann at webkit.org
hausmann at webkit.org
Wed Dec 22 16:25:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit afad407738ea51e8254dcbd23fa942376d128937
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 23 14:22:59 2010 +0000
[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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72600 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 2e8c6b7..14090a3 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -2116,7 +2116,7 @@ void QWebPage::setUserPermission(QWebFrame* frame, PermissionDomain domain, Perm
switch (domain) {
case NotificationsPermissionDomain:
#if ENABLE(NOTIFICATIONS)
- if (policy == PermissionGranted)
+ if (policy == PermissionGrantedByUser)
NotificationPresenterClientQt::notificationPresenter()->allowNotificationForFrame(frame->d->frame);
#endif
break;
diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index 9fa3518..d440558 100644
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -198,9 +198,9 @@ public:
};
enum PermissionPolicy {
- PermissionGranted,
PermissionUnknown,
- PermissionDenied
+ PermissionGrantedByUser,
+ PermissionDeniedByUser
};
enum PermissionDomain {
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 0ddc0e1..0ab75eb 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,21 @@
+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
+
+ 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 at sencha.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp b/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp
index 5fb9ab7..d7619d0 100644
--- a/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp
@@ -84,9 +84,9 @@ void GeolocationPermissionClientQt::setPermission(QWebFrame* webFrame, QWebPage:
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
return;
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 413984a..44dac3a 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::PermissionDomain domain)
{
if (m_allowGeolocation)
- setUserPermission(frame, domain, PermissionGranted);
+ setUserPermission(frame, domain, PermissionGrantedByUser);
else
- setUserPermission(frame, domain, PermissionDenied);
+ setUserPermission(frame, domain, PermissionDeniedByUser);
}
public:
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 824b717..2fe53f9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,22 @@
+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
+
+ 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 at chromium.org>
Reviewed by Jeremy Orlow.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 0982a6f..8c9be18 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -224,14 +224,14 @@ void WebPage::requestPermission(QWebFrame* frame, QWebPage::PermissionDomain dom
switch (domain) {
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);
break;
@@ -259,9 +259,9 @@ void WebPage::permissionSet(QWebPage::PermissionDomain domain)
Q_ASSERT(m_drt->layoutTestController()->isGeolocationPermissionSet());
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();
break;
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 624cf97..20a3584 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::NotificationsPermissionDomain, QWebPage::PermissionGranted);
+ m_drt->webPage()->setUserPermission(frame, QWebPage::NotificationsPermissionDomain, QWebPage::PermissionGrantedByUser);
m_desktopNotificationAllowedOrigins.append(origin);
}
diff --git a/WebKitTools/QtTestBrowser/webpage.cpp b/WebKitTools/QtTestBrowser/webpage.cpp
index 114ed6c..6660376 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::PermissionDomain domain)
{
- setUserPermission(frame, domain, PermissionGranted);
+ setUserPermission(frame, domain, PermissionGrantedByUser);
}
void WebPage::cancelRequestsForPermission(QWebFrame*, QWebPage::PermissionDomain)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list