From 349d11dd83578b5baeec87e41c71f612e5bd21b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Thu, 1 Mar 2018 14:32:48 +0100 Subject: Move quota and registerProtocolHandler permission classes to core - Move QWebEngineQuotaPermissionRequest and QWebEngineRegisterProtocolHandlerPermissionRequest to QtWebEngineCore. - Delete QQuickWebEngineQuotaPermissionRequest and QQuickWebEngineRegisterProtocolHandlerPermissionRequest. Miscellaneous cleanup: - Mark QWebEngineQuotaPermissionRequest constructors as internal for QDoc. - Remove superfluous Q_DECLARE_METATYPEs (implied by Q_GADGET). - Remove Q_UNREACHABLE from default constructor. For some reason QML seems to default construct an unused temporary object before throwing it away and copy constructing the actual object. This triggers Q_UNREACHABLE. Change-Id: Icf9f4e34996e4c64aec65b734bcb3bbd22b4dc51 Reviewed-by: Kai Koehne --- src/webengine/api/qquickwebengineview.cpp | 62 ++----------------------------- src/webengine/api/qquickwebengineview_p.h | 50 ++----------------------- 2 files changed, 8 insertions(+), 104 deletions(-) (limited to 'src/webengine/api') diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index eb67d6571..5e11a1c04 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -45,8 +45,6 @@ #include "certificate_error_controller.h" #include "file_picker_controller.h" #include "javascript_dialog_controller.h" -#include "quota_permission_controller.h" -#include "register_protocol_handler_permission_controller.h" #include "qquickwebenginehistory_p.h" #include "qquickwebenginecertificateerror_p.h" #include "qquickwebenginecontextmenurequest_p.h" @@ -58,6 +56,8 @@ #include "qquickwebengineprofile_p.h" #include "qquickwebenginesettings_p.h" #include "qquickwebenginescript_p.h" +#include "qwebenginequotapermissionrequest.h" +#include "qwebengineregisterprotocolhandlerpermissionrequest.h" #ifdef ENABLE_QML_TESTSUPPORT_API #include "qquickwebenginetestsupport_p.h" @@ -593,14 +593,14 @@ void QQuickWebEngineViewPrivate::runMouseLockPermissionRequest(const QUrl &secur void QQuickWebEngineViewPrivate::runQuotaPermissionRequest(QSharedPointer controller) { Q_Q(QQuickWebEngineView); - QQuickWebEngineQuotaPermissionRequest request(controller); + QWebEngineQuotaPermissionRequest request(std::move(controller)); Q_EMIT q->quotaPermissionRequested(request); } void QQuickWebEngineViewPrivate::runRegisterProtocolHandlerPermissionRequest(QSharedPointer controller) { Q_Q(QQuickWebEngineView); - QQuickWebEngineRegisterProtocolHandlerPermissionRequest request(std::move(controller)); + QWebEngineRegisterProtocolHandlerPermissionRequest request(std::move(controller)); Q_EMIT q->registerProtocolHandlerPermissionRequested(request); } @@ -1805,60 +1805,6 @@ void QQuickWebEngineFullScreenRequest::reject() m_viewPrivate->setFullScreenMode(!m_toggleOn); } -QQuickWebEngineQuotaPermissionRequest::QQuickWebEngineQuotaPermissionRequest(QSharedPointer controller) - : d_ptr(controller) -{ -} - -QQuickWebEngineQuotaPermissionRequest::~QQuickWebEngineQuotaPermissionRequest() -{ -} - -void QQuickWebEngineQuotaPermissionRequest::accept() -{ - d_ptr->accept(); -} - -void QQuickWebEngineQuotaPermissionRequest::reject() -{ - d_ptr->reject(); -} - -QUrl QQuickWebEngineQuotaPermissionRequest::origin() const -{ - return d_ptr->origin(); -} - -qint64 QQuickWebEngineQuotaPermissionRequest::requestedSize() const -{ - return d_ptr->requestedSize(); -} - -QQuickWebEngineRegisterProtocolHandlerPermissionRequest::QQuickWebEngineRegisterProtocolHandlerPermissionRequest( - QSharedPointer d_ptr) - : d_ptr(std::move(d_ptr)) -{} - -void QQuickWebEngineRegisterProtocolHandlerPermissionRequest::accept() -{ - d_ptr->accept(); -} - -void QQuickWebEngineRegisterProtocolHandlerPermissionRequest::reject() -{ - d_ptr->reject(); -} - -QUrl QQuickWebEngineRegisterProtocolHandlerPermissionRequest::origin() const -{ - return d_ptr->origin(); -} - -QString QQuickWebEngineRegisterProtocolHandlerPermissionRequest::protocol() const -{ - return d_ptr->protocol(); -} - QQuickContextMenuBuilder::QQuickContextMenuBuilder(const QtWebEngineCore::WebEngineContextMenuData &data, QQuickWebEngineView *view, QObject *menu) diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 5b018b8a8..76b5c2be9 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -57,12 +57,6 @@ #include -namespace QtWebEngineCore { - class QuotaPermissionController; - class RegisterProtocolHandlerPermissionController; -} - - QT_BEGIN_NAMESPACE class QQmlWebChannel; @@ -82,6 +76,8 @@ class QQuickWebEngineProfile; class QQuickWebEngineSettings; class QQuickWebEngineFormValidationMessageRequest; class QQuickWebEngineViewPrivate; +class QWebEngineQuotaPermissionRequest; +class QWebEngineRegisterProtocolHandlerPermissionRequest; #ifdef ENABLE_QML_TESTSUPPORT_API class QQuickWebEngineTestSupport; @@ -106,42 +102,6 @@ private: const bool m_toggleOn; }; -class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineQuotaPermissionRequest { - Q_GADGET - Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL) - Q_PROPERTY(qint64 requestedSize READ requestedSize CONSTANT FINAL) -public: - QQuickWebEngineQuotaPermissionRequest() {} - QQuickWebEngineQuotaPermissionRequest(QSharedPointer controller); - ~QQuickWebEngineQuotaPermissionRequest(); - - Q_INVOKABLE void accept(); - Q_INVOKABLE void reject(); - QUrl origin() const; - qint64 requestedSize() const; - -private: - QSharedPointer d_ptr; -}; - -class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineRegisterProtocolHandlerPermissionRequest { - Q_GADGET - Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL) - Q_PROPERTY(QString protocol READ protocol CONSTANT FINAL) -public: - QQuickWebEngineRegisterProtocolHandlerPermissionRequest() {} - QQuickWebEngineRegisterProtocolHandlerPermissionRequest( - QSharedPointer); - - Q_INVOKABLE void accept(); - Q_INVOKABLE void reject(); - QUrl origin() const; - QString protocol() const; - -private: - QSharedPointer d_ptr; -}; - #define LATEST_WEBENGINEVIEW_REVISION 7 class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem { @@ -582,11 +542,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 QQuickWebEngineQuotaPermissionRequest &request); + Q_REVISION(7) void quotaPermissionRequested(const QWebEngineQuotaPermissionRequest &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 QQuickWebEngineRegisterProtocolHandlerPermissionRequest &request); + Q_REVISION(7) void registerProtocolHandlerPermissionRequested(const QWebEngineRegisterProtocolHandlerPermissionRequest &request); #ifdef ENABLE_QML_TESTSUPPORT_API void testSupportChanged(); @@ -616,7 +576,5 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickWebEngineView) Q_DECLARE_METATYPE(QQuickWebEngineFullScreenRequest) -Q_DECLARE_METATYPE(QQuickWebEngineQuotaPermissionRequest) -Q_DECLARE_METATYPE(QQuickWebEngineRegisterProtocolHandlerPermissionRequest) #endif // QQUICKWEBENGINEVIEW_P_H -- cgit v1.2.3