[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:30 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e5cfcdc269bd2b9cac916295a8bd3316ac85be88
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 23 14:24:06 2010 +0000
[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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72603 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index 817fa3f..f1f5d24 100644
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -393,8 +393,8 @@ Q_SIGNALS:
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:
virtual QWebPage *createWindow(WebWindowType type);
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4f5a4ad..38f02c5 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -5,6 +5,24 @@
[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 at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
+ [Qt] Review the setUserPermission & friends API
+ https://bugs.webkit.org/show_bug.cgi?id=46810
+
Rename setUserPermission to setFeaturePermission
* Api/qwebpage.cpp:
diff --git a/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp b/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp
index 2e54935..7500e99 100644
--- a/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/GeolocationPermissionClientQt.cpp
@@ -65,7 +65,7 @@ void GeolocationPermissionClientQt::requestGeolocationPermissionForFrame(QWebFra
m_pendingPermissionRequests.insert(webFrame, listener);
QWebPage* page = webFrame->page();
- emit page->requestPermissionFromUser(webFrame, QWebPage::Geolocation);
+ emit page->featurePermissionRequested(webFrame, QWebPage::Geolocation);
}
@@ -74,7 +74,7 @@ void GeolocationPermissionClientQt::cancelGeolocationPermissionRequestForFrame(Q
m_pendingPermissionRequests.remove(webFrame);
QWebPage* page = webFrame->page();
- emit page->cancelRequestsForPermission(webFrame, QWebPage::Geolocation);
+ emit page->featurePermissionRequestCanceled(webFrame, QWebPage::Geolocation);
}
void GeolocationPermissionClientQt::setPermission(QWebFrame* webFrame, QWebPage::PermissionPolicy permission)
diff --git a/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp b/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
index d5caf36..994cd85 100644
--- a/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
@@ -328,7 +328,7 @@ void NotificationPresenterClientQt::requestPermission(ScriptExecutionContext* co
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);
}
}
}
@@ -358,7 +358,7 @@ void NotificationPresenterClientQt::cancelRequestsForPermission(ScriptExecutionC
if (dumpNotification)
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);
}
void NotificationPresenterClientQt::allowNotificationForFrame(Frame* frame)
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0a845cb..2e4d1b7 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
+ 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 at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
+ [Qt] Review the setUserPermission & friends API
+ https://bugs.webkit.org/show_bug.cgi?id=46810
+
Rename setUserPermission to setFeaturePermission
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index f2ccc59..10a6af0 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -158,8 +158,8 @@ WebPage::WebPage(QObject* parent, DumpRenderTree* drt)
setNetworkAccessManager(m_drt->networkAccessManager());
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)));
}
WebPage::~WebPage()
diff --git a/WebKitTools/QtTestBrowser/webpage.cpp b/WebKitTools/QtTestBrowser/webpage.cpp
index 319494d..b6caf67 100644
--- a/WebKitTools/QtTestBrowser/webpage.cpp
+++ b/WebKitTools/QtTestBrowser/webpage.cpp
@@ -50,8 +50,8 @@ WebPage::WebPage(QObject* parent)
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)));
}
void WebPage::applyProxy()
@@ -172,7 +172,7 @@ void WebPage::requestPermission(QWebFrame* frame, QWebPage::Feature feature)
setFeaturePermission(frame, feature, PermissionGrantedByUser);
}
-void WebPage::cancelRequestsForPermission(QWebFrame*, QWebPage::Feature)
+void WebPage::featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature)
{
}
diff --git a/WebKitTools/QtTestBrowser/webpage.h b/WebKitTools/QtTestBrowser/webpage.h
index 8a46da5..01f3f6a 100644
--- a/WebKitTools/QtTestBrowser/webpage.h
+++ b/WebKitTools/QtTestBrowser/webpage.h
@@ -58,7 +58,7 @@ public slots:
bool shouldInterruptJavaScript();
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:
void applyProxy();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list