summaryrefslogtreecommitdiffstats
path: root/src/webengine/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/webengine/api')
-rw-r--r--src/webengine/api/qquickwebengineview.cpp62
-rw-r--r--src/webengine/api/qquickwebengineview_p.h50
2 files changed, 8 insertions, 104 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index eb67d657..5e11a1c0 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<QtWebEngineCore::QuotaPermissionController> controller)
{
Q_Q(QQuickWebEngineView);
- QQuickWebEngineQuotaPermissionRequest request(controller);
+ QWebEngineQuotaPermissionRequest request(std::move(controller));
Q_EMIT q->quotaPermissionRequested(request);
}
void QQuickWebEngineViewPrivate::runRegisterProtocolHandlerPermissionRequest(QSharedPointer<RegisterProtocolHandlerPermissionController> 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<QtWebEngineCore::QuotaPermissionController> 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<QtWebEngineCore::RegisterProtocolHandlerPermissionController> 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 5b018b8a..76b5c2be 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -57,12 +57,6 @@
#include <QtGui/qcolor.h>
-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<QtWebEngineCore::QuotaPermissionController> controller);
- ~QQuickWebEngineQuotaPermissionRequest();
-
- Q_INVOKABLE void accept();
- Q_INVOKABLE void reject();
- QUrl origin() const;
- qint64 requestedSize() const;
-
-private:
- QSharedPointer<QtWebEngineCore::QuotaPermissionController> 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<QtWebEngineCore::RegisterProtocolHandlerPermissionController>);
-
- Q_INVOKABLE void accept();
- Q_INVOKABLE void reject();
- QUrl origin() const;
- QString protocol() const;
-
-private:
- QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController> 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