2 files changed, 4 insertions, 47 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 72089a5c4..8086b7d1d 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -61,6 +61,7 @@
 #include "qquickwebenginetouchhandleprovider_p_p.h"
 #include "qwebenginecertificateerror.h"
 #include "qwebenginefindtextresult.h"
+#include "qwebenginefullscreenrequest.h"
 #include "qwebenginequotarequest.h"
 #include "qwebengineregisterprotocolhandlerrequest.h"
 
@@ -617,7 +618,7 @@ void QQuickWebEngineViewPrivate::windowCloseRejected()
 void QQuickWebEngineViewPrivate::requestFullScreenMode(const QUrl &origin, bool fullscreen)
 {
     Q_Q(QQuickWebEngineView);
-    QQuickWebEngineFullScreenRequest request(this, origin, fullscreen);
+    QWebEngineFullScreenRequest request(origin, fullscreen, [q = QPointer(q)] (bool toggleOn) { if (q) q->d_ptr->setFullScreenMode(toggleOn); });
     Q_EMIT q->fullScreenRequested(request);
 }
 
@@ -2286,31 +2287,6 @@ QQuickWebEngineView::LifecycleState QQuickWebEngineView::recommendedState() cons
     return static_cast<LifecycleState>(d->adapter->recommendedState());
 }
 
-QQuickWebEngineFullScreenRequest::QQuickWebEngineFullScreenRequest()
-    : m_viewPrivate(0)
-    , m_toggleOn(false)
-{
-}
-
-QQuickWebEngineFullScreenRequest::QQuickWebEngineFullScreenRequest(QQuickWebEngineViewPrivate *viewPrivate, const QUrl &origin, bool toggleOn)
-    : m_viewPrivate(viewPrivate)
-    , m_origin(origin)
-    , m_toggleOn(toggleOn)
-{
-}
-
-void QQuickWebEngineFullScreenRequest::accept()
-{
-    if (m_viewPrivate)
-        m_viewPrivate->setFullScreenMode(m_toggleOn);
-}
-
-void QQuickWebEngineFullScreenRequest::reject()
-{
-    if (m_viewPrivate)
-        m_viewPrivate->setFullScreenMode(!m_toggleOn);
-}
-
 QQuickContextMenuBuilder::QQuickContextMenuBuilder(QWebEngineContextMenuRequest *request,
                                                    QQuickWebEngineView *view, QObject *menu)
     : QtWebEngineCore::RenderViewContextMenuQt(request), m_view(view), m_menu(menu)
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index e169d0490..68c40616d 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -84,6 +84,7 @@ class QQuickWebEngineFormValidationMessageRequest;
 class QQuickWebEngineViewPrivate;
 class QWebEngineCertificateError;
 class QWebEngineFindTextResult;
+class QWebEngineFullScreenRequest;
 class QWebEngineQuotaRequest;
 class QWebEngineRegisterProtocolHandlerRequest;
 class QWebEngineContextMenuRequest;
@@ -92,25 +93,6 @@ class QWebEngineContextMenuRequest;
 class QQuickWebEngineTestSupport;
 #endif
 
-class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineFullScreenRequest {
-    Q_GADGET
-    Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL)
-    Q_PROPERTY(bool toggleOn READ toggleOn CONSTANT FINAL)
-public:
-    QQuickWebEngineFullScreenRequest();
-    QQuickWebEngineFullScreenRequest(QQuickWebEngineViewPrivate *viewPrivate, const QUrl &origin, bool toggleOn);
-
-    Q_INVOKABLE void accept();
-    Q_INVOKABLE void reject();
-    QUrl origin() const { return m_origin; }
-    bool toggleOn() const { return m_toggleOn; }
-
-private:
-    QQuickWebEngineViewPrivate *m_viewPrivate;
-    const QUrl m_origin;
-    const bool m_toggleOn;
-};
-
 #define LATEST_WEBENGINEVIEW_REVISION 10
 
 class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
@@ -553,7 +535,7 @@ Q_SIGNALS:
     void navigationRequested(QQuickWebEngineNavigationRequest *request);
     void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID);
     Q_REVISION(1) void certificateError(const QWebEngineCertificateError &error);
-    Q_REVISION(1) void fullScreenRequested(const QQuickWebEngineFullScreenRequest &request);
+    Q_REVISION(1) void fullScreenRequested(const QWebEngineFullScreenRequest &request);
     Q_REVISION(1) void isFullScreenChanged();
     Q_REVISION(1) void featurePermissionRequested(const QUrl &securityOrigin, Feature feature);
     Q_REVISION(1) void newViewRequested(QQuickWebEngineNewViewRequest *request);
@@ -619,6 +601,5 @@ private:
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QQuickWebEngineView)
-Q_DECLARE_METATYPE(QQuickWebEngineFullScreenRequest)
 
 #endif // QQUICKWEBENGINEVIEW_P_H