From 6deddc5ecd6155c567aecd0338c53c63fa465bfd Mon Sep 17 00:00:00 2001
From: Tamas Zakor <ztamas@inf.u-szeged.hu>
Date: Wed, 8 Jul 2020 14:50:14 +0200
Subject: Ignore QQuickWebEngineNewViewRequest if it is unhandled

This is the case when the WebEngineNewViewRequest.openIn()
is not called on newViewRequested().

For example, when opening the view source from context
menu in quick minimal example.

Fixes: QTBUG-85494
Change-Id: I7c1ae53684361de459b2f268e471904e632821b0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/webengine/api/qquickwebengineview.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/webengine/api/qquickwebengineview.cpp')

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index aeb202c6a..7b875bf55 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -554,6 +554,7 @@ QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> ne
                                            const QRect &, const QUrl &targetUrl)
 {
     Q_Q(QQuickWebEngineView);
+    Q_ASSERT(newWebContents);
     QQuickWebEngineNewViewRequest request;
     request.m_adapter = newWebContents;
     request.m_isUserInitiated = userGesture;
@@ -578,6 +579,9 @@ QQuickWebEngineViewPrivate::adoptNewWindow(QSharedPointer<WebContentsAdapter> ne
 
     Q_EMIT q->newViewRequested(&request);
 
+    if (!request.m_isRequestHandled)
+        return nullptr;
+
     return newWebContents;
 }
 
-- 
cgit v1.2.1