Fix a crash in WebEngineSettings when opening a new window

A new window means that the QWebEnginePage gets its WebContentsAdapter
swapped and that the pointer in WebEngineSettings must be updated.

Do the WebContentsAdapter-to-WebEngineSettings binding in
WebContentsAdapter::initialize to cover both cases.

This also refactors the way that QWebEngineSettings is created by
removing the need to pass a QWebEngineSettingsPrivate instance to be
adopted, and also move the global settings construction logic in
the singleton accessor instead of relying on the fact that it uses
a different contructor.

Change-Id: I6f8a2ed1407a4b25f9898526db9432721c354ddf
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h
index 5e19c242d..a1c41c187 100644
--- a/src/core/web_engine_settings.h
+++ b/src/core/web_engine_settings.h
@@ -99,7 +99,6 @@ public:
     };
 
     WebEngineSettings(WebEngineSettingsDelegate*);
-    WebEngineSettings(WebEngineSettingsDelegate *,WebContentsAdapter *);
     virtual ~WebEngineSettings();
 
     void overrideWebPreferences(WebPreferences *prefs);
@@ -125,6 +124,7 @@ public:
 private:
     void doApply();
     void applySettingsToWebPreferences(WebPreferences *);
+    void setWebContentsAdapter(WebContentsAdapter *adapter) { m_adapter = adapter; }
 
     WebContentsAdapter* m_adapter;
     WebEngineSettingsDelegate* m_delegate;
@@ -136,6 +136,7 @@ private:
     QScopedPointer<BatchTimer> m_batchTimer;
 
     friend class BatchTimer;
+    friend class WebContentsAdapter;
 };
 
 #endif // WEB_ENGINE_SETTINGS_H