From b78e0c8a1e2df919f652da5e508306c8250c012e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
Date: Tue, 20 Mar 2018 17:51:28 +0100
Subject: [PATCH] Shorten names of permission classes
Remove 'permission' from class and signal names, so e.g.
QWebEngineQuotaPermissionRequest becomes QWebEngineQuotaRequest and
quotaPermissionRequested becomes quotaRequested.
Rename the internal controller classes to public name + "Controller".
Change-Id: I247714ab0a2880adbf4ed8ee68f1b78838ae7a14
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
.../quicknanobrowser/BrowserWindow.qml | 6 +--
.../simplebrowser/webpage.cpp | 8 ++--
.../webenginewidgets/simplebrowser/webpage.h | 4 +-
src/core/api/core_api.pro | 8 ++--
...request.cpp => qwebenginequotarequest.cpp} | 46 +++++++++---------
...sionrequest.h => qwebenginequotarequest.h} | 20 ++++----
...bengineregisterprotocolhandlerrequest.cpp} | 38 +++++++--------
...webengineregisterprotocolhandlerrequest.h} | 22 ++++-----
src/core/core_chromium.pri | 14 +++---
src/core/quota_permission_context_qt.cpp | 6 +--
...ontroller.h => quota_request_controller.h} | 14 +++---
....cpp => quota_request_controller_impl.cpp} | 10 ++--
...impl.h => quota_request_controller_impl.h} | 12 ++---
...ter_protocol_handler_request_controller.h} | 14 +++---
...tocol_handler_request_controller_impl.cpp} | 12 ++---
...rotocol_handler_request_controller_impl.h} | 14 +++---
...sion_controller.h => request_controller.h} | 12 ++---
src/core/web_contents_adapter_client.h | 8 ++--
src/core/web_contents_delegate_qt.cpp | 8 ++--
src/webengine/api/qquickwebengineview.cpp | 16 +++----
src/webengine/api/qquickwebengineview_p.h | 8 ++--
src/webengine/api/qquickwebengineview_p_p.h | 4 +-
src/webengine/doc/src/webengineview_lgpl.qdoc | 48 +++++++++----------
src/webengine/plugin/plugin.cpp | 16 +++----
src/webenginewidgets/api/qwebenginepage.cpp | 28 +++++------
src/webenginewidgets/api/qwebenginepage.h | 8 ++--
src/webenginewidgets/api/qwebenginepage_p.h | 4 +-
tests/auto/quick/publicapi/tst_publicapi.cpp | 28 +++++------
.../qwebenginepage/tst_qwebenginepage.cpp | 16 +++----
29 files changed, 224 insertions(+), 228 deletions(-)
rename src/core/api/{qwebenginequotapermissionrequest.cpp => qwebenginequotarequest.cpp} (65%)
rename src/core/api/{qwebenginequotapermissionrequest.h => qwebenginequotarequest.h} (78%)
rename src/core/api/{qwebengineregisterprotocolhandlerpermissionrequest.cpp => qwebengineregisterprotocolhandlerrequest.cpp} (66%)
rename src/core/api/{qwebengineregisterprotocolhandlerpermissionrequest.h => qwebengineregisterprotocolhandlerrequest.h} (73%)
rename src/core/{quota_permission_controller.h => quota_request_controller.h} (86%)
rename src/core/{quota_permission_controller_impl.cpp => quota_request_controller_impl.cpp} (91%)
rename src/core/{quota_permission_controller_impl.h => quota_request_controller_impl.h} (89%)
rename src/core/{register_protocol_handler_permission_controller.h => register_protocol_handler_request_controller.h} (82%)
rename src/core/{register_protocol_handler_permission_controller_impl.cpp => register_protocol_handler_request_controller_impl.cpp} (86%)
rename src/core/{register_protocol_handler_permission_controller_impl.h => register_protocol_handler_request_controller_impl.h} (82%)
rename src/core/{permission_controller.h => request_controller.h} (91%)
diff --git a/examples/webengine/quicknanobrowser/BrowserWindow.qml b/examples/webengine/quicknanobrowser/BrowserWindow.qml
index 55a35d611..5e98997ee 100644
--- a/examples/webengine/quicknanobrowser/BrowserWindow.qml
+++ b/examples/webengine/quicknanobrowser/BrowserWindow.qml
@@ -438,15 +438,15 @@ ApplicationWindow {
request.accept();
}
- onQuotaPermissionRequested: {
+ onQuotaRequested: {
if (request.requestedSize <= 5 * 1024 * 1024)
request.accept();
else
request.reject();
}
- onRegisterProtocolHandlerPermissionRequested: {
- print("accepting registerProtocolHandler permission request for " + request.scheme + " from " + request.origin);
+ onRegisterProtocolHandlerRequested: {
+ print("accepting registerProtocolHandler request for " + request.scheme + " from " + request.origin);
request.accept();
}
diff --git a/examples/webenginewidgets/simplebrowser/webpage.cpp b/examples/webenginewidgets/simplebrowser/webpage.cpp
index 48a9d86b9..512778b82 100644
--- a/examples/webenginewidgets/simplebrowser/webpage.cpp
+++ b/examples/webenginewidgets/simplebrowser/webpage.cpp
@@ -63,7 +63,7 @@ WebPage::WebPage(QWebEngineProfile *profile, QObject *parent)
{
connect(this, &QWebEnginePage::authenticationRequired, this, &WebPage::handleAuthenticationRequired);
connect(this, &QWebEnginePage::proxyAuthenticationRequired, this, &WebPage::handleProxyAuthenticationRequired);
- connect(this, &QWebEnginePage::registerProtocolHandlerPermissionRequested, this, &WebPage::handleRegisterProtocolHandlerPermissionRequested);
+ connect(this, &QWebEnginePage::registerProtocolHandlerRequested, this, &WebPage::handleRegisterProtocolHandlerRequested);
}
bool WebPage::certificateError(const QWebEngineCertificateError &error)
@@ -143,8 +143,8 @@ void WebPage::handleProxyAuthenticationRequired(const QUrl &, QAuthenticator *au
}
}
-//! [registerProtocolHandlerPermissionRequested]
-void WebPage::handleRegisterProtocolHandlerPermissionRequested(QWebEngineRegisterProtocolHandlerPermissionRequest request)
+//! [registerProtocolHandlerRequested]
+void WebPage::handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request)
{
auto answer = QMessageBox::question(
view()->window(),
@@ -157,4 +157,4 @@ void WebPage::handleRegisterProtocolHandlerPermissionRequested(QWebEngineRegiste
else
request.reject();
}
-//! [registerProtocolHandlerPermissionRequested]
+//! [registerProtocolHandlerRequested]
diff --git a/examples/webenginewidgets/simplebrowser/webpage.h b/examples/webenginewidgets/simplebrowser/webpage.h
index d44c79358..c8b884077 100644
--- a/examples/webenginewidgets/simplebrowser/webpage.h
+++ b/examples/webenginewidgets/simplebrowser/webpage.h
@@ -52,7 +52,7 @@
#define WEBPAGE_H
#include <QWebEnginePage>
-#include <QWebEngineRegisterProtocolHandlerPermissionRequest>
+#include <QWebEngineRegisterProtocolHandlerRequest>
class WebPage : public QWebEnginePage
{
@@ -67,7 +67,7 @@ protected:
private slots:
void handleAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth);
void handleProxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *auth, const QString &proxyHost);
- void handleRegisterProtocolHandlerPermissionRequested(QWebEngineRegisterProtocolHandlerPermissionRequest request);
+ void handleRegisterProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request);
};
#endif // WEBPAGE_H
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index 637a2ffa0..632034a9d 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -37,8 +37,8 @@ HEADERS = \
qwebenginecookiestore.h \
qwebenginecookiestore_p.h \
qwebenginehttprequest.h \
- qwebenginequotapermissionrequest.h \
- qwebengineregisterprotocolhandlerpermissionrequest.h \
+ qwebenginequotarequest.h \
+ qwebengineregisterprotocolhandlerrequest.h \
qwebengineurlrequestinterceptor.h \
qwebengineurlrequestinfo.h \
qwebengineurlrequestinfo_p.h \
@@ -50,8 +50,8 @@ SOURCES = \
qwebenginebrowsercontext.cpp \
qwebenginecookiestore.cpp \
qwebenginehttprequest.cpp \
- qwebenginequotapermissionrequest.cpp \
- qwebengineregisterprotocolhandlerpermissionrequest.cpp \
+ qwebenginequotarequest.cpp \
+ qwebengineregisterprotocolhandlerrequest.cpp \
qwebengineurlrequestinfo.cpp \
qwebengineurlrequestjob.cpp \
qwebengineurlschemehandler.cpp
diff --git a/src/core/api/qwebenginequotapermissionrequest.cpp b/src/core/api/qwebenginequotarequest.cpp
similarity index 65%
rename from src/core/api/qwebenginequotapermissionrequest.cpp
rename to src/core/api/qwebenginequotarequest.cpp
index 86ed65326..49c9f041f 100644
--- a/src/core/api/qwebenginequotapermissionrequest.cpp
+++ b/src/core/api/qwebenginequotarequest.cpp
@@ -37,32 +37,32 @@
**
****************************************************************************/
-#include "qwebenginequotapermissionrequest.h"
+#include "qwebenginequotarequest.h"
-#include "quota_permission_controller.h"
+#include "quota_request_controller.h"
QT_BEGIN_NAMESPACE
/*!
- \class QWebEngineQuotaPermissionRequest
- \brief The QWebEngineQuotaPermissionRequest class enables accepting or rejecting
- requests for larger persistent storage than the application's current allocation
- in File System API.
+ \class QWebEngineQuotaRequest
+ \brief The QWebEngineQuotaRequest class enables accepting or rejecting
+ requests for larger persistent storage than the application's current
+ allocation in File System API.
\since 5.11
\inmodule QtWebEngineCore
- This class is used by the QWebEnginePage::quotaPermissionRequested() signal
- to \l accept() or \l reject() a request for an increase in the persistent
- storage allocated to the application. The default quota is 0 bytes.
+ This class is used by the QWebEnginePage::quotaRequested() signal to \l
+ accept() or \l reject() a request for an increase in the persistent storage
+ allocated to the application. The default quota is 0 bytes.
*/
-/*! \fn QWebEngineQuotaPermissionRequest::QWebEngineQuotaPermissionRequest()
+/*! \fn QWebEngineQuotaRequest::QWebEngineQuotaRequest()
\internal
*/
/*! \internal */
-QWebEngineQuotaPermissionRequest::QWebEngineQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController> controller)
+QWebEngineQuotaRequest::QWebEngineQuotaRequest(QSharedPointer<QtWebEngineCore::QuotaRequestController> controller)
: d_ptr(controller)
{
}
@@ -70,7 +70,7 @@ QWebEngineQuotaPermissionRequest::QWebEngineQuotaPermissionRequest(QSharedPointe
/*!
Rejects a request for larger persistent storage.
*/
-void QWebEngineQuotaPermissionRequest::reject()
+void QWebEngineQuotaRequest::reject()
{
d_ptr->reject();
}
@@ -78,39 +78,37 @@ void QWebEngineQuotaPermissionRequest::reject()
/*!
Accepts a request for larger persistent storage.
*/
-void QWebEngineQuotaPermissionRequest::accept()
+void QWebEngineQuotaRequest::accept()
{
d_ptr->accept();
}
/*!
- \property QWebEngineQuotaPermissionRequest::origin
- \brief The URL of the web page that issued the quota permission request.
+ \property QWebEngineQuotaRequest::origin
+ \brief The URL of the web page that issued the quota request.
*/
-QUrl QWebEngineQuotaPermissionRequest::origin() const
+QUrl QWebEngineQuotaRequest::origin() const
{
return d_ptr->origin();
}
/*!
- \property QWebEngineQuotaPermissionRequest::requestedSize
+ \property QWebEngineQuotaRequest::requestedSize
\brief Contains the size of the requested disk space in bytes.
*/
-qint64 QWebEngineQuotaPermissionRequest::requestedSize() const
+qint64 QWebEngineQuotaRequest::requestedSize() const
{
return d_ptr->requestedSize();
}
-/*! \fn bool QWebEngineQuotaPermissionRequest::operator==(const QWebEngineQuotaPermissionRequest &that) const
- Returns \c true if \a that points to the same object as this quota
- permission request.
+/*! \fn bool QWebEngineQuotaRequest::operator==(const QWebEngineQuotaRequest &that) const
+ Returns \c true if \a that points to the same object as this quota request.
*/
-/*! \fn bool QWebEngineQuotaPermissionRequest::operator!=(const QWebEngineQuotaPermissionRequest &that) const
- Returns \c true if \a that points to a different object than this quota
- permission request.
+/*! \fn bool QWebEngineQuotaRequest::operator!=(const QWebEngineQuotaRequest &that) const
+ Returns \c true if \a that points to a different object than this request.
*/
QT_END_NAMESPACE
diff --git a/src/core/api/qwebenginequotapermissionrequest.h b/src/core/api/qwebenginequotarequest.h
similarity index 78%
rename from src/core/api/qwebenginequotapermissionrequest.h
rename to src/core/api/qwebenginequotarequest.h
index 5c6e6c007..dbba6ad82 100644
--- a/src/core/api/qwebenginequotapermissionrequest.h
+++ b/src/core/api/qwebenginequotarequest.h
@@ -37,36 +37,36 @@
**
****************************************************************************/
-#ifndef QWEBENGINEQUOTAPERMISSIONREQUEST_H
-#define QWEBENGINEQUOTAPERMISSIONREQUEST_H
+#ifndef QWEBENGINEQUOTAREQUEST_H
+#define QWEBENGINEQUOTAREQUEST_H
#include <QtCore/qsharedpointer.h>
#include <QtCore/qurl.h>
#include <QtWebEngineCore/qtwebenginecoreglobal.h>
namespace QtWebEngineCore {
- class QuotaPermissionController;
+ class QuotaRequestController;
}
QT_BEGIN_NAMESPACE
-class QWEBENGINE_EXPORT QWebEngineQuotaPermissionRequest {
+class QWEBENGINE_EXPORT QWebEngineQuotaRequest {
Q_GADGET
Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
Q_PROPERTY(qint64 requestedSize READ requestedSize CONSTANT FINAL)
public:
- QWebEngineQuotaPermissionRequest() {}
- QWebEngineQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController>);
+ QWebEngineQuotaRequest() {}
+ QWebEngineQuotaRequest(QSharedPointer<QtWebEngineCore::QuotaRequestController>);
Q_INVOKABLE void accept();
Q_INVOKABLE void reject();
QUrl origin() const;
qint64 requestedSize() const;
- bool operator==(const QWebEngineQuotaPermissionRequest &that) const { return d_ptr == that.d_ptr; }
- bool operator!=(const QWebEngineQuotaPermissionRequest &that) const { return d_ptr != that.d_ptr; }
+ bool operator==(const QWebEngineQuotaRequest &that) const { return d_ptr == that.d_ptr; }
+ bool operator!=(const QWebEngineQuotaRequest &that) const { return d_ptr != that.d_ptr; }
private:
- QSharedPointer<QtWebEngineCore::QuotaPermissionController> d_ptr;
+ QSharedPointer<QtWebEngineCore::QuotaRequestController> d_ptr;
};
QT_END_NAMESPACE
-#endif // QWEBENGINEQUOTAPERMISSIONREQUEST_H
+#endif // QWEBENGINEQUOTAREQUEST_H
diff --git a/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp b/src/core/api/qwebengineregisterprotocolhandlerrequest.cpp
similarity index 66%
rename from src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp
rename to src/core/api/qwebengineregisterprotocolhandlerrequest.cpp
index b045a2823..1921f78f4 100644
--- a/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp
+++ b/src/core/api/qwebengineregisterprotocolhandlerrequest.cpp
@@ -37,29 +37,29 @@
**
****************************************************************************/
-#include "qwebengineregisterprotocolhandlerpermissionrequest.h"
+#include "qwebengineregisterprotocolhandlerrequest.h"
-#include "register_protocol_handler_permission_controller.h"
+#include "register_protocol_handler_request_controller.h"
QT_BEGIN_NAMESPACE
/*!
- \class QWebEngineRegisterProtocolHandlerPermissionRequest
+ \class QWebEngineRegisterProtocolHandlerRequest
\inmodule QtWebEngineCore
\since 5.11
- \brief The QWebEngineRegisterProtocolHandlerPermissionRequest class enables
+ \brief The QWebEngineRegisterProtocolHandlerRequest class enables
accepting or rejecting requests from the \l registerProtocolHandler API.
- \sa QWebEnginePage::registerProtocolHandlerPermissionRequested
+ \sa QWebEnginePage::registerProtocolHandlerRequested
*/
-/*! \fn QWebEngineRegisterProtocolHandlerPermissionRequest::QWebEngineRegisterProtocolHandlerPermissionRequest()
+/*! \fn QWebEngineRegisterProtocolHandlerRequest::QWebEngineRegisterProtocolHandlerRequest()
\internal
*/
/*! \internal */
-QWebEngineRegisterProtocolHandlerPermissionRequest::QWebEngineRegisterProtocolHandlerPermissionRequest(
- QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController> d_ptr)
+QWebEngineRegisterProtocolHandlerRequest::QWebEngineRegisterProtocolHandlerRequest(
+ QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerRequestController> d_ptr)
: d_ptr(std::move(d_ptr))
{}
@@ -68,7 +68,7 @@ QWebEngineRegisterProtocolHandlerPermissionRequest::QWebEngineRegisterProtocolHa
Subsequent calls to accept() and reject() are ignored.
*/
-void QWebEngineRegisterProtocolHandlerPermissionRequest::reject()
+void QWebEngineRegisterProtocolHandlerRequest::reject()
{
d_ptr->reject();
}
@@ -78,41 +78,39 @@ void QWebEngineRegisterProtocolHandlerPermissionRequest::reject()
Subsequent calls to accept() and reject() are ignored.
*/
-void QWebEngineRegisterProtocolHandlerPermissionRequest::accept()
+void QWebEngineRegisterProtocolHandlerRequest::accept()
{
d_ptr->accept();
}
/*!
- \property QWebEngineRegisterProtocolHandlerPermissionRequest::origin
+ \property QWebEngineRegisterProtocolHandlerRequest::origin
\brief The URL template for the protocol handler.
This is the second parameter from the \l registerProtocolHandler call.
*/
-QUrl QWebEngineRegisterProtocolHandlerPermissionRequest::origin() const
+QUrl QWebEngineRegisterProtocolHandlerRequest::origin() const
{
return d_ptr->origin();
}
/*!
- \property QWebEngineRegisterProtocolHandlerPermissionRequest::scheme
+ \property QWebEngineRegisterProtocolHandlerRequest::scheme
\brief The URL scheme for the protocol handler.
This is the first parameter from the \l registerProtocolHandler call.
*/
-QString QWebEngineRegisterProtocolHandlerPermissionRequest::scheme() const
+QString QWebEngineRegisterProtocolHandlerRequest::scheme() const
{
return d_ptr->scheme();
}
-/*! \fn bool QWebEngineRegisterProtocolHandlerPermissionRequest::operator==(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const
- Returns \c true if \a that points to the same object as this protocol
- handler permission request.
+/*! \fn bool QWebEngineRegisterProtocolHandlerRequest::operator==(const QWebEngineRegisterProtocolHandlerRequest &that) const
+ Returns \c true if \a that points to the same object as this request.
*/
-/*! \fn bool QWebEngineRegisterProtocolHandlerPermissionRequest::operator!=(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const
- Returns \c true if \a that points to a different object than this protocol
- handler permission request.
+/*! \fn bool QWebEngineRegisterProtocolHandlerRequest::operator!=(const QWebEngineRegisterProtocolHandlerRequest &that) const
+ Returns \c true if \a that points to a different object than this request.
*/
QT_END_NAMESPACE
diff --git a/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.h b/src/core/api/qwebengineregisterprotocolhandlerrequest.h
similarity index 73%
rename from src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.h
rename to src/core/api/qwebengineregisterprotocolhandlerrequest.h
index 254f26508..936043b4d 100644
--- a/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.h
+++ b/src/core/api/qwebengineregisterprotocolhandlerrequest.h
@@ -37,37 +37,37 @@
**
****************************************************************************/
-#ifndef QWEBENGINEREGISTERPROTOCOLHANDLERPERMISSIONREQUEST_H
-#define QWEBENGINEREGISTERPROTOCOLHANDLERPERMISSIONREQUEST_H
+#ifndef QWEBENGINEREGISTERPROTOCOLHANDLERREQUEST_H
+#define QWEBENGINEREGISTERPROTOCOLHANDLERREQUEST_H
#include <QtCore/qsharedpointer.h>
#include <QtCore/qurl.h>
#include <QtWebEngineCore/qtwebenginecoreglobal.h>
namespace QtWebEngineCore {
- class RegisterProtocolHandlerPermissionController;
+ class RegisterProtocolHandlerRequestController;
}
QT_BEGIN_NAMESPACE
-class QWEBENGINE_EXPORT QWebEngineRegisterProtocolHandlerPermissionRequest {
+class QWEBENGINE_EXPORT QWebEngineRegisterProtocolHandlerRequest {
Q_GADGET
Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
Q_PROPERTY(QString scheme READ scheme CONSTANT FINAL)
public:
- QWebEngineRegisterProtocolHandlerPermissionRequest() {}
- QWebEngineRegisterProtocolHandlerPermissionRequest(
- QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController>);
+ QWebEngineRegisterProtocolHandlerRequest() {}
+ QWebEngineRegisterProtocolHandlerRequest(
+ QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerRequestController>);
Q_INVOKABLE void accept();
Q_INVOKABLE void reject();
QUrl origin() const;
QString scheme() const;
- bool operator==(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const { return d_ptr == that.d_ptr; }
- bool operator!=(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const { return d_ptr != that.d_ptr; }
+ bool operator==(const QWebEngineRegisterProtocolHandlerRequest &that) const { return d_ptr == that.d_ptr; }
+ bool operator!=(const QWebEngineRegisterProtocolHandlerRequest &that) const { return d_ptr != that.d_ptr; }
private:
- QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController> d_ptr;
+ QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerRequestController> d_ptr;
};
QT_END_NAMESPACE
-#endif // QWEBENGINEREGISTERPROTOCOLHANDLERPERMISSIONREQUEST_H
+#endif // QWEBENGINEREGISTERPROTOCOLHANDLERREQUEST_H
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index 3d23f44b7..73e07c156 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -90,8 +90,8 @@ SOURCES = \
permission_manager_qt.cpp \
process_main.cpp \
quota_permission_context_qt.cpp \
- quota_permission_controller_impl.cpp \
- register_protocol_handler_permission_controller_impl.cpp \
+ quota_request_controller_impl.cpp \
+ register_protocol_handler_request_controller_impl.cpp \
render_view_context_menu_qt.cpp \
render_view_observer_host_qt.cpp \
render_widget_host_view_qt.cpp \
@@ -174,15 +174,14 @@ HEADERS = \
ozone/ozone_platform_qt.h \
ozone/platform_window_qt.h \
ozone/surface_factory_qt.h \
- permission_controller.h \
permission_manager_qt.h \
process_main.h \
proxy_config_service_qt.h \
quota_permission_context_qt.h \
- quota_permission_controller.h \
- quota_permission_controller_impl.h \
- register_protocol_handler_permission_controller.h \
- register_protocol_handler_permission_controller_impl.h \
+ quota_request_controller.h \
+ quota_request_controller_impl.h \
+ register_protocol_handler_request_controller.h \
+ register_protocol_handler_request_controller_impl.h \
render_view_context_menu_qt.h \
render_view_observer_host_qt.h \
render_widget_host_view_qt.h \
@@ -196,6 +195,7 @@ HEADERS = \
renderer_host/resource_dispatcher_host_delegate_qt.h \
renderer_host/user_resource_controller_host.h \
renderer_host/web_channel_ipc_transport_host.h \
+ request_controller.h \
resource_context_qt.h \
type_conversion.h \
user_script.h \
diff --git a/src/core/quota_permission_context_qt.cpp b/src/core/quota_permission_context_qt.cpp
index 0fdcef3b3..4e9293447 100644
--- a/src/core/quota_permission_context_qt.cpp
+++ b/src/core/quota_permission_context_qt.cpp
@@ -42,7 +42,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
-#include "quota_permission_controller_impl.h"
+#include "quota_request_controller_impl.h"
#include "web_contents_delegate_qt.h"
#include "web_contents_view_qt.h"
@@ -82,8 +82,8 @@ void QuotaPermissionContextQt::RequestQuotaPermission(const StorageQuotaParams &
if (!client)
return;
- QSharedPointer<QuotaPermissionController> request(new QuotaPermissionControllerImpl(this, params, callback));
- client->runQuotaPermissionRequest(request);
+ QSharedPointer<QuotaRequestController> request(new QuotaRequestControllerImpl(this, params, callback));
+ client->runQuotaRequest(request);
}
void QuotaPermissionContextQt::dispatchCallbackOnIOThread(const PermissionCallback &callback,
diff --git a/src/core/quota_permission_controller.h b/src/core/quota_request_controller.h
similarity index 86%
rename from src/core/quota_permission_controller.h
rename to src/core/quota_request_controller.h
index be228f369..f5c7a3f04 100644
--- a/src/core/quota_permission_controller.h
+++ b/src/core/quota_request_controller.h
@@ -37,17 +37,17 @@
**
****************************************************************************/
-#ifndef QUOTA_PERMISSION_CONTROLLER_H
-#define QUOTA_PERMISSION_CONTROLLER_H
+#ifndef QUOTA_REQUEST_CONTROLLER_H
+#define QUOTA_REQUEST_CONTROLLER_H
-#include "permission_controller.h"
+#include "request_controller.h"
namespace QtWebEngineCore {
-class QWEBENGINE_EXPORT QuotaPermissionController : public PermissionController {
+class QWEBENGINE_EXPORT QuotaRequestController : public RequestController {
public:
- QuotaPermissionController(QUrl origin, qint64 requestedSize)
- : PermissionController(std::move(origin))
+ QuotaRequestController(QUrl origin, qint64 requestedSize)
+ : RequestController(std::move(origin))
, m_requestedSize(requestedSize)
{}
@@ -59,4 +59,4 @@ private:
} // namespace QtWebEngineCore
-#endif // QUOTA_PERMISSION_CONTROLLER_H
+#endif // QUOTA_REQUEST_CONTROLLER_H
diff --git a/src/core/quota_permission_controller_impl.cpp b/src/core/quota_request_controller_impl.cpp
similarity index 91%
rename from src/core/quota_permission_controller_impl.cpp
rename to src/core/quota_request_controller_impl.cpp
index ebad4b2fb..ee94e1cdd 100644
--- a/src/core/quota_permission_controller_impl.cpp
+++ b/src/core/quota_request_controller_impl.cpp
@@ -37,29 +37,29 @@
**
****************************************************************************/
-#include "quota_permission_controller_impl.h"
+#include "quota_request_controller_impl.h"
#include "type_conversion.h"
namespace QtWebEngineCore {
-QuotaPermissionControllerImpl::QuotaPermissionControllerImpl(
+QuotaRequestControllerImpl::QuotaRequestControllerImpl(
QuotaPermissionContextQt *context,
const content::StorageQuotaParams ¶ms,
const content::QuotaPermissionContext::PermissionCallback &callback)
- : QuotaPermissionController(
+ : QuotaRequestController(
toQt(params.origin_url),
params.requested_size)
, m_context(context)
, m_callback(callback)
{}
-void QuotaPermissionControllerImpl::accepted()
+void QuotaRequestControllerImpl::accepted()
{
m_context->dispatchCallbackOnIOThread(m_callback, QuotaPermissionContextQt::QUOTA_PERMISSION_RESPONSE_ALLOW);
}
-void QuotaPermissionControllerImpl::rejected()
+void QuotaRequestControllerImpl::rejected()
{
m_context->dispatchCallbackOnIOThread(m_callback, QuotaPermissionContextQt::QUOTA_PERMISSION_RESPONSE_DISALLOW);
}
diff --git a/src/core/quota_permission_controller_impl.h b/src/core/quota_request_controller_impl.h
similarity index 89%
rename from src/core/quota_permission_controller_impl.h
rename to src/core/quota_request_controller_impl.h
index 297c6711b..dacdce72f 100644
--- a/src/core/quota_permission_controller_impl.h
+++ b/src/core/quota_request_controller_impl.h
@@ -37,17 +37,17 @@
**
****************************************************************************/
-#ifndef QUOTA_PERMISSION_CONTROLLER_IMPL_H
-#define QUOTA_PERMISSION_CONTROLLER_IMPL_H
+#ifndef QUOTA_REQUEST_CONTROLLER_IMPL_H
+#define QUOTA_REQUEST_CONTROLLER_IMPL_H
-#include "quota_permission_controller.h"
#include "quota_permission_context_qt.h"
+#include "quota_request_controller.h"
namespace QtWebEngineCore {
-class QuotaPermissionControllerImpl final : public QuotaPermissionController {
+class QuotaRequestControllerImpl final : public QuotaRequestController {
public:
- QuotaPermissionControllerImpl(
+ QuotaRequestControllerImpl(
QuotaPermissionContextQt *context,
const content::StorageQuotaParams ¶ms,
const content::QuotaPermissionContext::PermissionCallback &callback);
@@ -63,4 +63,4 @@ private:
} // namespace QtWebEngineCore
-#endif // QUOTA_PERMISSION_CONTROLLER_IMPL_H
+#endif // QUOTA_REQUEST_CONTROLLER_IMPL_H
diff --git a/src/core/register_protocol_handler_permission_controller.h b/src/core/register_protocol_handler_request_controller.h
similarity index 82%
rename from src/core/register_protocol_handler_permission_controller.h
rename to src/core/register_protocol_handler_request_controller.h
index ce1e84084..be60619f5 100644
--- a/src/core/register_protocol_handler_permission_controller.h
+++ b/src/core/register_protocol_handler_request_controller.h
@@ -37,17 +37,17 @@
**
****************************************************************************/
-#ifndef REGISTER_PROTOCOL_HANDLER_PERMISSION_CONTROLLER_H
-#define REGISTER_PROTOCOL_HANDLER_PERMISSION_CONTROLLER_H
+#ifndef REGISTER_PROTOCOL_HANDLER_REQUEST_CONTROLLER_H
+#define REGISTER_PROTOCOL_HANDLER_REQUEST_CONTROLLER_H
-#include "permission_controller.h"
+#include "request_controller.h"
namespace QtWebEngineCore {
-class QWEBENGINE_EXPORT RegisterProtocolHandlerPermissionController : public PermissionController {
+class QWEBENGINE_EXPORT RegisterProtocolHandlerRequestController : public RequestController {
public:
- RegisterProtocolHandlerPermissionController(QUrl origin, QString scheme)
- : PermissionController(std::move(origin))
+ RegisterProtocolHandlerRequestController(QUrl origin, QString scheme)
+ : RequestController(std::move(origin))
, m_scheme(std::move(scheme))
{}
@@ -59,4 +59,4 @@ private:
} // namespace QtWebEngineCore
-#endif // REGISTER_PROTOCOL_HANDLER_PERMISSION_CONTROLLER_H
+#endif // REGISTER_PROTOCOL_HANDLER_REQUEST_CONTROLLER_H
diff --git a/src/core/register_protocol_handler_permission_controller_impl.cpp b/src/core/register_protocol_handler_request_controller_impl.cpp
similarity index 86%
rename from src/core/register_protocol_handler_permission_controller_impl.cpp
rename to src/core/register_protocol_handler_request_controller_impl.cpp
index 98d257e38..1e3a15c93 100644
--- a/src/core/register_protocol_handler_permission_controller_impl.cpp
+++ b/src/core/register_protocol_handler_request_controller_impl.cpp
@@ -36,7 +36,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "register_protocol_handler_permission_controller_impl.h"
+#include "register_protocol_handler_request_controller_impl.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
#include "content/public/browser/web_contents.h"
@@ -44,17 +44,17 @@
namespace QtWebEngineCore {
-RegisterProtocolHandlerPermissionControllerImpl::RegisterProtocolHandlerPermissionControllerImpl(
+RegisterProtocolHandlerRequestControllerImpl::RegisterProtocolHandlerRequestControllerImpl(
content::WebContents *webContents,
ProtocolHandler handler)
- : RegisterProtocolHandlerPermissionController(
+ : RegisterProtocolHandlerRequestController(
toQt(handler.url()),
toQt(handler.protocol()))
, content::WebContentsObserver(webContents)
, m_handler(handler)
{}
-ProtocolHandlerRegistry *RegisterProtocolHandlerPermissionControllerImpl::protocolHandlerRegistry()
+ProtocolHandlerRegistry *RegisterProtocolHandlerRequestControllerImpl::protocolHandlerRegistry()
{
content::WebContents *webContents = web_contents();
if (!webContents)
@@ -63,13 +63,13 @@ ProtocolHandlerRegistry *RegisterProtocolHandlerPermissionControllerImpl::protoc
return ProtocolHandlerRegistryFactory::GetForBrowserContext(context);
}
-void RegisterProtocolHandlerPermissionControllerImpl::accepted()
+void RegisterProtocolHandlerRequestControllerImpl::accepted()
{
if (ProtocolHandlerRegistry *registry = protocolHandlerRegistry())
registry->OnAcceptRegisterProtocolHandler(m_handler);
}
-void RegisterProtocolHandlerPermissionControllerImpl::rejected()
+void RegisterProtocolHandlerRequestControllerImpl::rejected()
{
if (ProtocolHandlerRegistry *registry = protocolHandlerRegistry())
registry->OnIgnoreRegisterProtocolHandler(m_handler);
diff --git a/src/core/register_protocol_handler_permission_controller_impl.h b/src/core/register_protocol_handler_request_controller_impl.h
similarity index 82%
rename from src/core/register_protocol_handler_permission_controller_impl.h
rename to src/core/register_protocol_handler_request_controller_impl.h
index 739b320c0..5ad64210c 100644
--- a/src/core/register_protocol_handler_permission_controller_impl.h
+++ b/src/core/register_protocol_handler_request_controller_impl.h
@@ -37,10 +37,10 @@
**
****************************************************************************/
-#ifndef REGISTER_PROTOCOL_HANDLER_PERMISSION_CONTROLLER_IMPL_H
-#define REGISTER_PROTOCOL_HANDLER_PERMISSION_CONTROLLER_IMPL_H
+#ifndef REGISTER_PROTOCOL_HANDLER_REQUEST_CONTROLLER_IMPL_H
+#define REGISTER_PROTOCOL_HANDLER_REQUEST_CONTROLLER_IMPL_H
-#include "register_protocol_handler_permission_controller.h"
+#include "register_protocol_handler_request_controller.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
#include "chrome/common/custom_handlers/protocol_handler.h"
@@ -50,10 +50,10 @@ class ProtocolHandlerRegistry;
namespace QtWebEngineCore {
-class RegisterProtocolHandlerPermissionControllerImpl final : public RegisterProtocolHandlerPermissionController,
- private content::WebContentsObserver {
+class RegisterProtocolHandlerRequestControllerImpl final : public RegisterProtocolHandlerRequestController,
+ private content::WebContentsObserver {
public:
- RegisterProtocolHandlerPermissionControllerImpl(
+ RegisterProtocolHandlerRequestControllerImpl(
content::WebContents *webContents,
ProtocolHandler handler);
@@ -68,4 +68,4 @@ private:
} // namespace QtWebEngineCore
-#endif // REGISTER_PROTOCOL_HANDLER_PERMISSION_CONTROLLER_IMPL_H
+#endif // REGISTER_PROTOCOL_HANDLER_REQUEST_CONTROLLER_IMPL_H
diff --git a/src/core/permission_controller.h b/src/core/request_controller.h
similarity index 91%
rename from src/core/permission_controller.h
rename to src/core/request_controller.h
index 22dfeb77e..83827a888 100644
--- a/src/core/permission_controller.h
+++ b/src/core/request_controller.h
@@ -36,8 +36,8 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#ifndef PERMISSION_CONTROLLER_H
-#define PERMISSION_CONTROLLER_H
+#ifndef REQUEST_CONTROLLER_H
+#define REQUEST_CONTROLLER_H
#include "qtwebenginecoreglobal.h"
@@ -45,9 +45,9 @@
namespace QtWebEngineCore {
-class QWEBENGINE_EXPORT PermissionController {
+class QWEBENGINE_EXPORT RequestController {
public:
- PermissionController(QUrl origin)
+ RequestController(QUrl origin)
: m_answered(false)
, m_origin(std::move(origin))
{}
@@ -68,7 +68,7 @@ public:
}
}
- virtual ~PermissionController() {}
+ virtual ~RequestController() {}
protected:
virtual void accepted() = 0;
@@ -81,4 +81,4 @@ private:
} // namespace QtWebEngineCore
-#endif // PERMISSION_CONTROLLER_H
+#endif // !REQUEST_CONTROLLER_H
diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
index 248a963b1..ad9c240e2 100644
--- a/src/core/web_contents_adapter_client.h
+++ b/src/core/web_contents_adapter_client.h
@@ -64,8 +64,8 @@ class BrowserContextAdapter;
class ColorChooserController;
class FilePickerController;
class JavaScriptDialogController;
-class QuotaPermissionController;
-class RegisterProtocolHandlerPermissionController;
+class QuotaRequestController;
+class RegisterProtocolHandlerRequestController;
class RenderWidgetHostViewQt;
class RenderWidgetHostViewQtDelegate;
class RenderWidgetHostViewQtDelegateClient;
@@ -438,8 +438,8 @@ public:
virtual void runGeolocationPermissionRequest(const QUrl &securityOrigin) = 0;
virtual void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) = 0;
virtual void runMouseLockPermissionRequest(const QUrl &securityOrigin) = 0;
- virtual void runQuotaPermissionRequest(QSharedPointer<QuotaPermissionController>) = 0;
- virtual void runRegisterProtocolHandlerPermissionRequest(QSharedPointer<RegisterProtocolHandlerPermissionController>) = 0;
+ virtual void runQuotaRequest(QSharedPointer<QuotaRequestController>) = 0;
+ virtual void runRegisterProtocolHandlerRequest(QSharedPointer<RegisterProtocolHandlerRequestController>) = 0;
virtual WebEngineSettings *webEngineSettings() const = 0;
RenderProcessTerminationStatus renderProcessExitStatus(int);
virtual void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode) = 0;
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 61aeda7bd..ab398ec44 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -58,7 +58,7 @@
#include "web_contents_adapter_p.h"
#include "web_engine_context.h"
#include "web_engine_settings.h"
-#include "register_protocol_handler_permission_controller_impl.h"
+#include "register_protocol_handler_request_controller_impl.h"
#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
#include "components/web_cache/browser/web_cache_manager.h"
@@ -638,9 +638,9 @@ void WebContentsDelegateQt::RegisterProtocolHandler(content::WebContents *webCon
if (registry->SilentlyHandleRegisterHandlerRequest(handler))
return;
- QSharedPointer<RegisterProtocolHandlerPermissionController> controller(
- new RegisterProtocolHandlerPermissionControllerImpl(webContents, handler));
- m_viewClient->runRegisterProtocolHandlerPermissionRequest(std::move(controller));
+ QSharedPointer<RegisterProtocolHandlerRequestController> controller(
+ new RegisterProtocolHandlerRequestControllerImpl(webContents, handler));
+ m_viewClient->runRegisterProtocolHandlerRequest(std::move(controller));
}
void WebContentsDelegateQt::UnregisterProtocolHandler(content::WebContents *webContents, const std::string &protocol, const GURL &url, bool)
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 18c54c263..eeb3157a2 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -56,8 +56,8 @@
#include "qquickwebengineprofile_p.h"
#include "qquickwebenginesettings_p.h"
#include "qquickwebenginescript_p.h"
-#include "qwebenginequotapermissionrequest.h"
-#include "qwebengineregisterprotocolhandlerpermissionrequest.h"
+#include "qwebenginequotarequest.h"
+#include "qwebengineregisterprotocolhandlerrequest.h"
#ifdef ENABLE_QML_TESTSUPPORT_API
#include "qquickwebenginetestsupport_p.h"
@@ -590,18 +590,18 @@ void QQuickWebEngineViewPrivate::runMouseLockPermissionRequest(const QUrl &secur
adapter->grantMouseLockPermission(false);
}
-void QQuickWebEngineViewPrivate::runQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController> controller)
+void QQuickWebEngineViewPrivate::runQuotaRequest(QSharedPointer<QtWebEngineCore::QuotaRequestController> controller)
{
Q_Q(QQuickWebEngineView);
- QWebEngineQuotaPermissionRequest request(std::move(controller));
- Q_EMIT q->quotaPermissionRequested(request);
+ QWebEngineQuotaRequest request(std::move(controller));
+ Q_EMIT q->quotaRequested(request);
}
-void QQuickWebEngineViewPrivate::runRegisterProtocolHandlerPermissionRequest(QSharedPointer<RegisterProtocolHandlerPermissionController> controller)
+void QQuickWebEngineViewPrivate::runRegisterProtocolHandlerRequest(QSharedPointer<RegisterProtocolHandlerRequestController> controller)
{
Q_Q(QQuickWebEngineView);
- QWebEngineRegisterProtocolHandlerPermissionRequest request(std::move(controller));
- Q_EMIT q->registerProtocolHandlerPermissionRequested(request);
+ QWebEngineRegisterProtocolHandlerRequest request(std::move(controller));
+ Q_EMIT q->registerProtocolHandlerRequested(request);
}
QObject *QQuickWebEngineViewPrivate::accessibilityParentObject()
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index ffa468eff..53d7facd3 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -76,8 +76,8 @@ class QQuickWebEngineProfile;
class QQuickWebEngineSettings;
class QQuickWebEngineFormValidationMessageRequest;
class QQuickWebEngineViewPrivate;
-class QWebEngineQuotaPermissionRequest;
-class QWebEngineRegisterProtocolHandlerPermissionRequest;
+class QWebEngineQuotaRequest;
+class QWebEngineRegisterProtocolHandlerRequest;
#ifdef ENABLE_QML_TESTSUPPORT_API
class QQuickWebEngineTestSupport;
@@ -541,11 +541,11 @@ Q_SIGNALS:
Q_REVISION(4) void fileDialogRequested(QQuickWebEngineFileDialogRequest *request);
Q_REVISION(4) void formValidationMessageRequested(QQuickWebEngineFormValidationMessageRequest *request);
Q_REVISION(5) void pdfPrintingFinished(const QString &filePath, bool success);
- Q_REVISION(7) void quotaPermissionRequested(const QWebEngineQuotaPermissionRequest &request);
+ Q_REVISION(7) void quotaRequested(const QWebEngineQuotaRequest &request);
Q_REVISION(7) void geometryChangeRequested(const QRect &geometry, const QRect &frameGeometry);
Q_REVISION(7) void inspectedViewChanged();
Q_REVISION(7) void devToolsViewChanged();
- Q_REVISION(7) void registerProtocolHandlerPermissionRequested(const QWebEngineRegisterProtocolHandlerPermissionRequest &request);
+ Q_REVISION(7) void registerProtocolHandlerRequested(const QWebEngineRegisterProtocolHandlerRequest &request);
#ifdef ENABLE_QML_TESTSUPPORT_API
void testSupportChanged();
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index 7369a63be..1af46f917 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -132,8 +132,8 @@ public:
void authenticationRequired(QSharedPointer<QtWebEngineCore::AuthenticationDialogController>) override;
void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) override;
void runMouseLockPermissionRequest(const QUrl &securityOrigin) override;
- void runQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController>) override;
- void runRegisterProtocolHandlerPermissionRequest(QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController>) override;
+ void runQuotaRequest(QSharedPointer<QtWebEngineCore::QuotaRequestController>) override;
+ void runRegisterProtocolHandlerRequest(QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerRequestController>) override;
QObject *accessibilityParentObject() override;
QtWebEngineCore::WebEngineSettings *webEngineSettings() const override;
void allowCertificateError(const QSharedPointer<CertificateErrorController> &errorController) override;
diff --git a/src/webengine/doc/src/webengineview_lgpl.qdoc b/src/webengine/doc/src/webengineview_lgpl.qdoc
index 1621d0821..a6a7c088b 100644
--- a/src/webengine/doc/src/webengineview_lgpl.qdoc
+++ b/src/webengine/doc/src/webengineview_lgpl.qdoc
@@ -1294,49 +1294,49 @@
*/
/*!
- \qmlsignal WebEngineView::quotaPermissionRequested(QuotaPermissionRequest request)
+ \qmlsignal WebEngineView::quotaRequested(QuotaRequest request)
\since QtWebEngine 1.7
This signal is emitted when the web page requests larger persistent storage
than the application's current allocation in File System API. The default quota
is 0 bytes.
- \sa QuotaPermissionRequest
+ \sa QuotaRequest
*/
/*!
- \qmltype QuotaPermissionRequest
- \instantiates QWebEngineQuotaPermissionRequest
+ \qmltype QuotaRequest
+ \instantiates QWebEngineQuotaRequest
\inqmlmodule QtWebEngine
\since QtWebEngine 1.7
- \brief A utility type for the WebEngineView::quotaPermissionRequested() signal.
+ \brief A utility type for the WebEngineView::quotaRequested() signal.
- \sa WebEngineView::quotaPermissionRequested()
+ \sa WebEngineView::quotaRequested()
*/
/*!
- \qmlproperty url QuotaPermissionRequest::origin
+ \qmlproperty url QuotaRequest::origin
\readonly
- The URL of the web page that issued the quota permission request.
+ The URL of the web page that issued the quota request.
*/
/*!
- \qmlproperty qint64 QuotaPermissionRequest::requestedSize
+ \qmlproperty qint64 QuotaRequest::requestedSize
\readonly
Contains the size of the requested disk space in bytes.
*/
/*!
- \qmlmethod void QuotaPermissionRequest::accept()
+ \qmlmethod void QuotaRequest::accept()
- Accepts the quota permission request.
+ Accepts the quota request.
\qml
WebEngineView {
- onQuotaPermissionRequested: function(request) {
+ onQuotaRequested: function(request) {
if (request.requestedSize <= 5 * 1024 * 1024)
request.accept();
else
@@ -1347,54 +1347,54 @@
*/
/*!
- \qmlmethod void QuotaPermissionRequest::reject()
- Rejects a quota permission request.
+ \qmlmethod void QuotaRequest::reject()
+ Rejects the quota request.
*/
/*!
- \qmlsignal WebEngineView::registerProtocolHandlerPermissionRequested(RegisterProtocolHandlerPermissionRequest request)
+ \qmlsignal WebEngineView::registerProtocolHandlerRequested(RegisterProtocolHandlerRequest request)
\since QtWebEngine 1.7
This signal is emitted when the web page tries to register a custom protocol
using the \l registerProtocolHandler API.
- \sa RegisterProtocolHandlerPermissionRequest
+ \sa RegisterProtocolHandlerRequest
*/
/*!
- \qmltype RegisterProtocolHandlerPermissionRequest
- \instantiates QWebEngineRegisterProtocolHandlerPermissionRequest
+ \qmltype RegisterProtocolHandlerRequest
+ \instantiates QWebEngineRegisterProtocolHandlerRequest
\inqmlmodule QtWebEngine
\since QtWebEngine 1.7
- \brief The RegisterProtocolHandlerPermissionRequest type enables accepting
+ \brief The RegisterProtocolHandlerRequest type enables accepting
or rejecting requests from the \l registerProtocolHandler API.
- \sa WebEngineView::registerProtocolHandlerPermissionRequested()
+ \sa WebEngineView::registerProtocolHandlerRequested()
*/
/*!
- \qmlproperty url RegisterProtocolHandlerPermissionRequest::origin
+ \qmlproperty url RegisterProtocolHandlerRequest::origin
\brief The URL template for the protocol handler.
This is the second parameter from the \l registerProtocolHandler call.
*/
/*!
- \qmlproperty string RegisterProtocolHandlerPermissionRequest::scheme
+ \qmlproperty string RegisterProtocolHandlerRequest::scheme
\brief The URL scheme for the protocol handler.
This is the first parameter from the \l registerProtocolHandler call.
*/
/*!
- \qmlmethod void RegisterProtocolHandlerPermissionRequest::accept()
+ \qmlmethod void RegisterProtocolHandlerRequest::accept()
\brief Accepts the request.
Subsequent calls to accept() and reject() are ignored.
*/
/*!
- \qmlmethod void RegisterProtocolHandlerPermissionRequest::reject()
+ \qmlmethod void RegisterProtocolHandlerRequest::reject()
\brief Accepts the request.
Subsequent calls to accept() and reject() are ignored.
diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp
index c9c9555e9..d81b797fc 100644
--- a/src/webengine/plugin/plugin.cpp
+++ b/src/webengine/plugin/plugin.cpp
@@ -52,8 +52,8 @@
#include "qquickwebenginesettings_p.h"
#include "qquickwebenginesingleton_p.h"
#include "qquickwebengineview_p.h"
-#include "qwebenginequotapermissionrequest.h"
-#include "qwebengineregisterprotocolhandlerpermissionrequest.h"
+#include "qwebenginequotarequest.h"
+#include "qwebengineregisterprotocolhandlerrequest.h"
#include "qtwebengineversion.h"
QT_BEGIN_NAMESPACE
@@ -141,12 +141,12 @@ public:
msgUncreatableType("FileDialogRequest"));
qmlRegisterUncreatableType<QQuickWebEngineFormValidationMessageRequest>(uri, 1, 4, "FormValidationMessageRequest",
msgUncreatableType("FormValidationMessageRequest"));
- qRegisterMetaType<QWebEngineQuotaPermissionRequest>();
- qmlRegisterUncreatableType<QWebEngineQuotaPermissionRequest>(uri, 1, 7, "QuotaPermissionRequest",
- msgUncreatableType("QuotaPermissionRequest"));
- qRegisterMetaType<QWebEngineRegisterProtocolHandlerPermissionRequest>();
- qmlRegisterUncreatableType<QWebEngineRegisterProtocolHandlerPermissionRequest>(uri, 1, 7, "RegisterProtocolHandlerPermissionRequest",
- msgUncreatableType("RegisterProtocolHandlerPermissionRequest"));
+ qRegisterMetaType<QWebEngineQuotaRequest>();
+ qmlRegisterUncreatableType<QWebEngineQuotaRequest>(uri, 1, 7, "QuotaRequest",
+ msgUncreatableType("QuotaRequest"));
+ qRegisterMetaType<QWebEngineRegisterProtocolHandlerRequest>();
+ qmlRegisterUncreatableType<QWebEngineRegisterProtocolHandlerRequest>(uri, 1, 7, "RegisterProtocolHandlerRequest",
+ msgUncreatableType("RegisterProtocolHandlerRequest"));
}
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 1c42628ee..5f0238dc0 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -53,8 +53,8 @@
#include "qwebenginehistory_p.h"
#include "qwebengineprofile.h"
#include "qwebengineprofile_p.h"
-#include "qwebenginequotapermissionrequest.h"
-#include "qwebengineregisterprotocolhandlerpermissionrequest.h"
+#include "qwebenginequotarequest.h"
+#include "qwebengineregisterprotocolhandlerrequest.h"
#include "qwebenginescriptcollection_p.h"
#include "qwebenginesettings.h"
#include "qwebengineview.h"
@@ -234,8 +234,8 @@ QWebEnginePagePrivate::QWebEnginePagePrivate(QWebEngineProfile *_profile)
{
memset(actions, 0, sizeof(actions));
- qRegisterMetaType<QWebEngineQuotaPermissionRequest>();
- qRegisterMetaType<QWebEngineRegisterProtocolHandlerPermissionRequest>();
+ qRegisterMetaType<QWebEngineQuotaRequest>();
+ qRegisterMetaType<QWebEngineRegisterProtocolHandlerRequest>();
// See wasShown() and wasHidden().
wasShownTimer.setSingleShot(true);
@@ -588,18 +588,18 @@ void QWebEnginePagePrivate::runMouseLockPermissionRequest(const QUrl &securityOr
Q_EMIT q->featurePermissionRequested(securityOrigin, QWebEnginePage::MouseLock);
}
-void QWebEnginePagePrivate::runQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController> controller)
+void QWebEnginePagePrivate::runQuotaRequest(QSharedPointer<QtWebEngineCore::QuotaRequestController> controller)
{
Q_Q(QWebEnginePage);
- QWebEngineQuotaPermissionRequest request(controller);
- Q_EMIT q->quotaPermissionRequested(request);
+ QWebEngineQuotaRequest request(controller);
+ Q_EMIT q->quotaRequested(request);
}
-void QWebEnginePagePrivate::runRegisterProtocolHandlerPermissionRequest(QSharedPointer<RegisterProtocolHandlerPermissionController> controller)
+void QWebEnginePagePrivate::runRegisterProtocolHandlerRequest(QSharedPointer<RegisterProtocolHandlerRequestController> controller)
{
Q_Q(QWebEnginePage);
- QWebEngineRegisterProtocolHandlerPermissionRequest request(std::move(controller));
- Q_EMIT q->registerProtocolHandlerPermissionRequested(request);
+ QWebEngineRegisterProtocolHandlerRequest request(std::move(controller));
+ Q_EMIT q->registerProtocolHandlerRequested(request);
}
QObject *QWebEnginePagePrivate::accessibilityParentObject()
@@ -773,18 +773,18 @@ QWebEnginePage::QWebEnginePage(QObject* parent)
*/
/*!
- \fn QWebEnginePage::quotaPermissionRequested(QWebEngineQuotaPermissionRequest quotaPermissionRequest)
+ \fn QWebEnginePage::quotaRequested(QWebEngineQuotaRequest quotaRequest)
\since 5.11
This signal is emitted when the web page requests larger persistent storage
than the application's current allocation in File System API. The default quota
is 0 bytes.
- The request object \a quotaPermissionRequest can be used to accept or reject the request.
+ The request object \a quotaRequest can be used to accept or reject the request.
*/
/*!
- \fn QWebEnginePage::registerProtocolHandlerPermissionRequested(QWebEngineRegisterProtocolHandlerPermissionRequest request)
+ \fn QWebEnginePage::registerProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request)
\since 5.11
This signal is emitted when the web page tries to register a custom protocol
@@ -792,7 +792,7 @@ QWebEnginePage::QWebEnginePage(QObject* parent)
The request object \a request can be used to accept or reject the request:
- \snippet webenginewidgets/simplebrowser/webpage.cpp registerProtocolHandlerPermissionRequested
+ \snippet webenginewidgets/simplebrowser/webpage.cpp registerProtocolHandlerRequested
*/
/*!
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index b2aca9030..3edfb96d0 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -65,8 +65,8 @@ class QWebEngineHistory;
class QWebEnginePage;
class QWebEnginePagePrivate;
class QWebEngineProfile;
-class QWebEngineQuotaPermissionRequest;
-class QWebEngineRegisterProtocolHandlerPermissionRequest;
+class QWebEngineQuotaRequest;
+class QWebEngineRegisterProtocolHandlerRequest;
class QWebEngineScriptCollection;
class QWebEngineSettings;
@@ -316,8 +316,8 @@ Q_SIGNALS:
void featurePermissionRequested(const QUrl &securityOrigin, QWebEnginePage::Feature feature);
void featurePermissionRequestCanceled(const QUrl &securityOrigin, QWebEnginePage::Feature feature);
void fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest);
- void quotaPermissionRequested(QWebEngineQuotaPermissionRequest quotaPermissionRequest);
- void registerProtocolHandlerPermissionRequested(QWebEngineRegisterProtocolHandlerPermissionRequest request);
+ void quotaRequested(QWebEngineQuotaRequest quotaRequest);
+ void registerProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request);
void authenticationRequired(const QUrl &requestUrl, QAuthenticator *authenticator);
void proxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *authenticator, const QString &proxyHost);
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index fd7928006..fcd7a2039 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -131,8 +131,8 @@ public:
void runMediaAccessPermissionRequest(const QUrl &securityOrigin, MediaRequestFlags requestFlags) override;
void runGeolocationPermissionRequest(const QUrl &securityOrigin) override;
void runMouseLockPermissionRequest(const QUrl &securityOrigin) override;
- void runQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController>) override;
- void runRegisterProtocolHandlerPermissionRequest(QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController>) override;
+ void runQuotaRequest(QSharedPointer<QtWebEngineCore::QuotaRequestController>) override;
+ void runRegisterProtocolHandlerRequest(QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerRequestController>) override;
QObject *accessibilityParentObject() override;
QtWebEngineCore::WebEngineSettings *webEngineSettings() const override;
void allowCertificateError(const QSharedPointer<CertificateErrorController> &controller) override;
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index efd063512..27f1ec616 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -35,8 +35,8 @@
#include <QtTest/QtTest>
#include <QtWebEngine/QQuickWebEngineProfile>
#include <QtWebEngine/QQuickWebEngineScript>
-#include <QtWebEngineCore/QWebEngineQuotaPermissionRequest>
-#include <QtWebEngineCore/QWebEngineRegisterProtocolHandlerPermissionRequest>
+#include <QtWebEngineCore/QWebEngineQuotaRequest>
+#include <QtWebEngineCore/QWebEngineRegisterProtocolHandlerRequest>
#include <private/qquickwebengineview_p.h>
#include <private/qquickwebenginecertificateerror_p.h>
#include <private/qquickwebenginedialogrequests_p.h>
@@ -75,8 +75,8 @@ static QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>()
<< &QQuickWebEngineFileDialogRequest::staticMetaObject
<< &QQuickWebEngineFormValidationMessageRequest::staticMetaObject
<< &QQuickWebEngineContextMenuRequest::staticMetaObject
- << &QWebEngineQuotaPermissionRequest::staticMetaObject
- << &QWebEngineRegisterProtocolHandlerPermissionRequest::staticMetaObject
+ << &QWebEngineQuotaRequest::staticMetaObject
+ << &QWebEngineRegisterProtocolHandlerRequest::staticMetaObject
;
static QList<const char *> knownEnumNames = QList<const char *>();
@@ -649,10 +649,10 @@ static QStringList expectedAPI = QStringList()
<< "QQuickWebEngineView.printToPdf(QString,PrintedPageSizeId,PrintedPageOrientation) --> void"
<< "QQuickWebEngineView.profile --> QQuickWebEngineProfile*"
<< "QQuickWebEngineView.profileChanged() --> void"
- << "QQuickWebEngineView.quotaPermissionRequested(QWebEngineQuotaPermissionRequest) --> void"
+ << "QQuickWebEngineView.quotaRequested(QWebEngineQuotaRequest) --> void"
<< "QQuickWebEngineView.recentlyAudible --> bool"
<< "QQuickWebEngineView.recentlyAudibleChanged(bool) --> void"
- << "QQuickWebEngineView.registerProtocolHandlerPermissionRequested(QWebEngineRegisterProtocolHandlerPermissionRequest) --> void"
+ << "QQuickWebEngineView.registerProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest) --> void"
<< "QQuickWebEngineView.reload() --> void"
<< "QQuickWebEngineView.reloadAndBypassCache() --> void"
<< "QQuickWebEngineView.renderProcessTerminated(RenderProcessTerminationStatus,int) --> void"
@@ -681,14 +681,14 @@ static QStringList expectedAPI = QStringList()
<< "QQuickWebEngineView.windowCloseRequested() --> void"
<< "QQuickWebEngineView.zoomFactor --> double"
<< "QQuickWebEngineView.zoomFactorChanged(double) --> void"
- << "QWebEngineQuotaPermissionRequest.accept() --> void"
- << "QWebEngineQuotaPermissionRequest.origin --> QUrl"
- << "QWebEngineQuotaPermissionRequest.reject() --> void"
- << "QWebEngineQuotaPermissionRequest.requestedSize --> qlonglong"
- << "QWebEngineRegisterProtocolHandlerPermissionRequest.accept() --> void"
- << "QWebEngineRegisterProtocolHandlerPermissionRequest.origin --> QUrl"
- << "QWebEngineRegisterProtocolHandlerPermissionRequest.reject() --> void"
- << "QWebEngineRegisterProtocolHandlerPermissionRequest.scheme --> QString"
+ << "QWebEngineQuotaRequest.accept() --> void"
+ << "QWebEngineQuotaRequest.origin --> QUrl"
+ << "QWebEngineQuotaRequest.reject() --> void"
+ << "QWebEngineQuotaRequest.requestedSize --> qlonglong"
+ << "QWebEngineRegisterProtocolHandlerRequest.accept() --> void"
+ << "QWebEngineRegisterProtocolHandlerRequest.origin --> QUrl"
+ << "QWebEngineRegisterProtocolHandlerRequest.reject() --> void"
+ << "QWebEngineRegisterProtocolHandlerRequest.scheme --> QString"
;
static bool isCheckedEnum(const QByteArray &typeName)
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 18a33695a..d193a07ce 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -49,8 +49,8 @@
#include <qwebenginehistory.h>
#include <qwebenginepage.h>
#include <qwebengineprofile.h>
-#include <qwebenginequotapermissionrequest.h>
-#include <qwebengineregisterprotocolhandlerpermissionrequest.h>
+#include <qwebenginequotarequest.h>
+#include <qwebengineregisterprotocolhandlerrequest.h>
#include <qwebenginescript.h>
#include <qwebenginescriptcollection.h>
#include <qwebenginesettings.h>
@@ -160,7 +160,7 @@ private Q_SLOTS:
void runJavaScript();
void fullScreenRequested();
- void quotaPermissionRequested();
+ void quotaRequested();
// Tests from tst_QWebEngineFrame
@@ -2750,7 +2750,7 @@ void tst_QWebEnginePage::fullScreenRequested()
QVERIFY(watcher.wait());
}
-void tst_QWebEnginePage::quotaPermissionRequested()
+void tst_QWebEnginePage::quotaRequested()
{
ConsolePage page;
QWebEngineView view;
@@ -2759,8 +2759,8 @@ void tst_QWebEnginePage::quotaPermissionRequested()
page.load(QUrl("qrc:///resources/content.html"));
QVERIFY(loadFinishedSpy.wait());
- connect(&page, &QWebEnginePage::quotaPermissionRequested,
- [] (QWebEngineQuotaPermissionRequest request)
+ connect(&page, &QWebEnginePage::quotaRequested,
+ [] (QWebEngineQuotaRequest request)
{
if (request.requestedSize() <= 5000)
request.accept();
@@ -4264,7 +4264,7 @@ void tst_QWebEnginePage::registerProtocolHandler()
QWebEnginePage page;
QSignalSpy loadSpy(&page, &QWebEnginePage::loadFinished);
- QSignalSpy permissionSpy(&page, &QWebEnginePage::registerProtocolHandlerPermissionRequested);
+ QSignalSpy permissionSpy(&page, &QWebEnginePage::registerProtocolHandlerRequested);
page.setUrl(server.url("/"));
QTRY_COMPARE(loadSpy.count(), 1);
@@ -4278,7 +4278,7 @@ void tst_QWebEnginePage::registerProtocolHandler()
page.runJavaScript(call);
QTRY_COMPARE(permissionSpy.count(), 1);
- auto request = permissionSpy.takeFirst().value(0).value<QWebEngineRegisterProtocolHandlerPermissionRequest>();
+ auto request = permissionSpy.takeFirst().value(0).value<QWebEngineRegisterProtocolHandlerRequest>();
QCOMPARE(request.origin(), QUrl(url));
QCOMPARE(request.scheme(), scheme);
if (permission)
--
GitLab