Fix how NewPopupDisposition is exposed in QQuickWebEngineView

I initially misintepreted the meaning of the enum, assuming that it
meant that the window should possibly be blocked. The user_gesture
parameter in WebContentsDelegate::AddNewContents is actually doing
this, while the popup disposition means that JavaScript requested
the window to be opened without one of the standard decoration (i.e.
status bar, menu bar, tool bar, etc.).

Update the QtQuick API to reflect this, renaming the "isPopup"
parameter to a more familiar "isUserInitiated".

The popup disposition is named "dialog" to match the previous
QWebPage::WebModalDialog enum.

Change-Id: Ib0c4bc53671fcf0dd9499aa1be2bbc8c494ba49e
Reviewed-by: Michael Bruning <michael.bruning@digia.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index c8c8bfac0..e3838255e 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -295,22 +295,22 @@ void QQuickWebEngineViewPrivate::focusContainer()
     q->forceActiveFocus();
 }
 
-void QQuickWebEngineViewPrivate::adoptNewWindow(WebContentsAdapter *newWebContents, WindowOpenDisposition disposition, const QRect &)
+void QQuickWebEngineViewPrivate::adoptNewWindow(WebContentsAdapter *newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &)
 {
     QQuickWebEngineNewViewRequest request;
     // This increases the ref-count of newWebContents and will tell Chromium
     // to start loading it and possibly return it to its parent page window.open().
     request.m_adapter = newWebContents;
-    request.m_isPopup = false;
+    request.m_isUserInitiated = userGesture;
 
     switch (disposition) {
-    case WebContentsAdapterClient::NewPopupDisposition:
-        request.m_isPopup = true;
-        // fall through
     case WebContentsAdapterClient::NewForegroundTabDisposition:
     case WebContentsAdapterClient::NewBackgroundTabDisposition:
         request.m_destination = QQuickWebEngineView::NewViewInTab;
         break;
+    case WebContentsAdapterClient::NewPopupDisposition:
+        request.m_destination = QQuickWebEngineView::NewViewInDialog;
+        break;
     case WebContentsAdapterClient::NewWindowDisposition:
         request.m_destination = QQuickWebEngineView::NewViewInWindow;
         break;