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>

4 files changed, 57 insertions, 27 deletions

diff --git a/src/webengine/api/qquickwebenginenewviewrequest.cpp b/src/webengine/api/qquickwebenginenewviewrequest.cpp
index 0af943de8..78ae1622a 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest.cpp
+++ b/src/webengine/api/qquickwebenginenewviewrequest.cpp
@@ -117,5 +117,6 @@ void QQuickWebEngineNewViewRequest::openIn(QQuickWebEngineView *view)
         view->d_func()->adoptWebContents(m_adapter.data());
     else
         view->setUrl(m_requestedUrl);
+    m_isRequestHandled = true;
     m_adapter.reset();
 }
diff --git a/src/webengine/api/qquickwebenginenewviewrequest_p.h b/src/webengine/api/qquickwebenginenewviewrequest_p.h
index e21f76111..d4686b291 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest_p.h
+++ b/src/webengine/api/qquickwebenginenewviewrequest_p.h
@@ -77,6 +77,7 @@ private:
     QQuickWebEngineNewViewRequest();
     QQuickWebEngineView::NewViewDestination m_destination;
     bool m_isUserInitiated;
+    bool m_isRequestHandled = false;
     QSharedPointer<QtWebEngineCore::WebContentsAdapter> m_adapter;
     QUrl m_requestedUrl;
     friend class QQuickWebEngineView;
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;
 }
 
diff --git a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
index a671c2ec7..80389e9f8 100644
--- a/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
+++ b/tests/auto/quick/qmltests/data/tst_newViewRequest.qml
@@ -37,6 +37,7 @@ TestWebEngineView {
 
     property var newViewRequest: null
     property var dialog: null
+    property string viewType: ""
 
     SignalSpy {
         id: newViewRequestedSpy
@@ -60,7 +61,12 @@ TestWebEngineView {
             "    TestWebEngineView { id: webView; anchors.fill: parent }\n" +
             "}", webEngineView);
 
-        request.openIn(dialog.webEngineView);
+        if (viewType === "dialog")
+            request.openIn(dialog.webEngineView);
+        else if (viewType === "null")
+            request.openIn(0);
+        else if (viewType === "webEngineView")
+            request.openIn(webEngineView);
     }
 
     TestCase {
@@ -74,6 +80,7 @@ TestWebEngineView {
 
             newViewRequestedSpy.clear();
             newViewRequest = null;
+            viewType = "";
         }
 
         function cleanup() {
@@ -81,7 +88,17 @@ TestWebEngineView {
                 dialog.destroy();
         }
 
-        function test_jsWindowOpen() {
+        function test_loadNewViewRequest_data() {
+            return [
+                   { tag: "dialog", viewType: "dialog" },
+                   { tag: "invalid", viewType: "null" },
+                   { tag: "unhandled", viewType: "" },
+                   { tag: "webEngineView", viewType: "webEngineView" },
+            ];
+        }
+
+        function test_loadNewViewRequest(row) {
+            viewType = row.viewType;
             var url = 'data:text/html,%3Chtml%3E%3Cbody%3ETest+Page%3C%2Fbody%3E%3C%2Fhtml%3E';
 
             // Open an empty page in a new tab
@@ -96,12 +113,14 @@ TestWebEngineView {
             compare(newViewRequest.destination, WebEngineView.NewViewInTab);
             verify(!newViewRequest.userInitiated);
 
-            verify(dialog.webEngineView.waitForLoadSucceeded());
-            compare(dialog.webEngineView.url, "");
+            if (viewType === "dialog") {
+                verify(dialog.webEngineView.waitForLoadSucceeded());
+                compare(dialog.webEngineView.url, "");
+                dialog.destroy();
+            }
             // https://chromium-review.googlesource.com/c/chromium/src/+/1300395
             compare(newViewRequest.requestedUrl, 'about:blank#blocked');
             newViewRequestedSpy.clear();
-            dialog.destroy();
 
             // Open a page in a new dialog
             webEngineView.loadHtml(
@@ -115,30 +134,35 @@ TestWebEngineView {
             compare(newViewRequest.destination, WebEngineView.NewViewInDialog);
             compare(newViewRequest.requestedUrl, url);
             verify(!newViewRequest.userInitiated);
-            verify(dialog.webEngineView.waitForLoadSucceeded());
+            if (viewType === "dialog") {
+                verify(dialog.webEngineView.waitForLoadSucceeded());
+                dialog.destroy();
+            }
             newViewRequestedSpy.clear();
-            dialog.destroy();
 
-            // Open a page in a new dialog by user
-            webEngineView.loadHtml(
-                "<html><head><script>" +
-                "   function popup() { window.open('" + url + "', '_blank', 'width=200,height=100'); }" +
-                "</script></head>" +
-                "<body onload=\"document.getElementById('popupButton').focus();\">" +
-                "   <button id='popupButton' onclick='popup()'>Pop Up!</button>" +
-                "</body></html>");
-            verify(webEngineView.waitForLoadSucceeded());
-            verifyElementHasFocus("popupButton");
-            keyPress(Qt.Key_Enter);
-            tryCompare(newViewRequestedSpy, "count", 1);
-            compare(newViewRequest.requestedUrl, url);
-
-            compare(newViewRequest.destination, WebEngineView.NewViewInDialog);
-            verify(newViewRequest.userInitiated);
-            verify(dialog.webEngineView.waitForLoadSucceeded());
-            newViewRequestedSpy.clear();
-            dialog.destroy();
+            if (viewType !== "webEngineView") {
+                // Open a page in a new dialog by user
+                webEngineView.loadHtml(
+                    "<html><head><script>" +
+                    "   function popup() { window.open('" + url + "', '_blank', 'width=200,height=100'); }" +
+                    "</script></head>" +
+                    "<body onload=\"document.getElementById('popupButton').focus();\">" +
+                    "   <button id='popupButton' onclick='popup()'>Pop Up!</button>" +
+                    "</body></html>");
+                verify(webEngineView.waitForLoadSucceeded());
+                verifyElementHasFocus("popupButton");
+                keyPress(Qt.Key_Enter);
+                tryCompare(newViewRequestedSpy, "count", 1);
+                compare(newViewRequest.requestedUrl, url);
+
+                compare(newViewRequest.destination, WebEngineView.NewViewInDialog);
+                verify(newViewRequest.userInitiated);
+                if (viewType === "dialog") {
+                    verify(dialog.webEngineView.waitForLoadSucceeded());
+                    dialog.destroy();
+                }
+                newViewRequestedSpy.clear();
+            }
         }
     }
 }
-