Handle new window/tab modifiers also on normal navigations

AddNewContents is only called when window.open is called from JavaScript.

We also want the shift/ctrl modifiers to trigger normal links to open
in the requested disposition. In this case OpenURLFromTab will pass
the detected disposition and we must create a new WebContents
ourselves.

Use the same code path going through
WebContentsAdapterClient::adoptNewWindow except that we pass a null
WebContents pointer to the WebContentsAdapter constructor and let it
create its own when initialized.

Change-Id: I817b0e72aec12723bf92d9b7ad85c1cecbf5e408
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

1 files changed, 5 insertions, 13 deletions

diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index c765c31ab..d2eb076d6 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -44,6 +44,7 @@
 // found in the LICENSE file.
 
 #include "web_contents_adapter.h"
+#include "web_contents_adapter_p.h"
 
 #include "browser_context_qt.h"
 #include "content_browser_client_qt.h"
@@ -52,7 +53,6 @@
 #include "qt_render_view_observer_host.h"
 #include "type_conversion.h"
 #include "web_contents_adapter_client.h"
-#include "web_contents_delegate_qt.h"
 #include "web_contents_view_qt.h"
 #include "web_engine_context.h"
 #include "web_engine_settings.h"
@@ -297,18 +297,6 @@ void deserializeNavigationHistory(QDataStream &input, int *currentIndex, std::ve
     }
 }
 
-class WebContentsAdapterPrivate {
-public:
-    WebContentsAdapterPrivate();
-    scoped_refptr<WebEngineContext> engineContext;
-    scoped_ptr<content::WebContents> webContents;
-    scoped_ptr<WebContentsDelegateQt> webContentsDelegate;
-    scoped_ptr<QtRenderViewObserverHost> renderViewObserverHost;
-    WebContentsAdapterClient *adapterClient;
-    quint64 nextRequestId;
-    int lastFindRequestId;
-};
-
 WebContentsAdapterPrivate::WebContentsAdapterPrivate()
     // This has to be the first thing we create, and the last we destroy.
     : engineContext(WebEngineContext::current())
@@ -317,6 +305,10 @@ WebContentsAdapterPrivate::WebContentsAdapterPrivate()
 {
 }
 
+WebContentsAdapterPrivate::~WebContentsAdapterPrivate()
+{
+}
+
 QExplicitlySharedDataPointer<WebContentsAdapter> WebContentsAdapter::createFromSerializedNavigationHistory(QDataStream &input, WebContentsAdapterClient *adapterClient)
 {
     int currentIndex;