setNetworkAccessManager(m_drt->networkAccessManager());
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(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()
fprintf(stdout, "ALERT: %s\n", message.toUtf8().constData());
}
-void WebPage::requestPermission(QWebFrame* frame, QWebPage::PermissionDomain domain)
+void WebPage::requestPermission(QWebFrame* frame, QWebPage::Feature feature)
{
- switch (domain) {
- case NotificationsPermissionDomain:
+ switch (feature) {
+ case Notifications:
if (!m_drt->layoutTestController()->ignoreReqestForPermission())
- setUserPermission(frame, domain, PermissionGranted);
+ setFeaturePermission(frame, feature, PermissionGrantedByUser);
break;
- case GeolocationPermissionDomain:
+ case Geolocation:
if (m_drt->layoutTestController()->isGeolocationPermissionSet())
if (m_drt->layoutTestController()->geolocationPermission())
- setUserPermission(frame, domain, PermissionGranted);
+ setFeaturePermission(frame, feature, PermissionGrantedByUser);
else
- setUserPermission(frame, domain, PermissionDenied);
+ setFeaturePermission(frame, feature, PermissionDeniedByUser);
else
m_pendingGeolocationRequests.append(frame);
break;
}
}
-void WebPage::cancelPermission(QWebFrame* frame, QWebPage::PermissionDomain domain)
+void WebPage::cancelPermission(QWebFrame* frame, QWebPage::Feature feature)
{
- switch (domain) {
- case GeolocationPermissionDomain:
+ switch (feature) {
+ case Geolocation:
m_pendingGeolocationRequests.removeOne(frame);
break;
default:
}
}
-void WebPage::permissionSet(QWebPage::PermissionDomain domain)
+void WebPage::permissionSet(QWebPage::Feature feature)
{
- switch (domain) {
- case GeolocationPermissionDomain:
+ switch (feature) {
+ case Geolocation:
{
Q_ASSERT(m_drt->layoutTestController()->isGeolocationPermissionSet());
foreach (QWebFrame* frame, m_pendingGeolocationRequests)
if (m_drt->layoutTestController()->geolocationPermission())
- setUserPermission(frame, domain, PermissionGranted);
+ setFeaturePermission(frame, feature, PermissionGrantedByUser);
else
- setUserPermission(frame, domain, PermissionDenied);
+ setFeaturePermission(frame, feature, PermissionDeniedByUser);
m_pendingGeolocationRequests.clear();
break;
static bool shouldEnableDeveloperExtras(const QUrl& url)
{
- return isWebInspectorTest(url) || url.path().contains("inspector-enabled/");
+ return true;
}
void DumpRenderTree::open(const QUrl& url)
void DumpRenderTree::geolocationPermissionSet()
{
- m_page->permissionSet(QWebPage::GeolocationPermissionDomain);
+ m_page->permissionSet(QWebPage::Geolocation);
}
void DumpRenderTree::switchFocus(bool focused)