Protect QML profiles as well as core

Moves QWebEngineBrowserContext to core and makes use of it from both
widget and qml.

Change-Id: I34748f302b0515b11b5831690d28478dfa6a852b
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/webengine/api/qquickwebengineprofile_p.h b/src/webengine/api/qquickwebengineprofile_p.h
index 1828f8085..660433fd9 100644
--- a/src/webengine/api/qquickwebengineprofile_p.h
+++ b/src/webengine/api/qquickwebengineprofile_p.h
@@ -52,8 +52,9 @@
 //
 
 #include "browser_context_adapter_client.h"
-#include "qquickwebengineprofile_p.h"
 #include "browser_context_adapter.h"
+#include "qwebenginebrowsercontext_p.h"
+#include "qquickwebengineprofile_p.h"
 
 #include <QExplicitlySharedDataPointer>
 #include <QMap>
@@ -71,7 +72,7 @@ public:
     QQuickWebEngineProfilePrivate(QSharedPointer<QtWebEngineCore::BrowserContextAdapter> browserContext);
     ~QQuickWebEngineProfilePrivate();
 
-    QSharedPointer<QtWebEngineCore::BrowserContextAdapter> browserContext() const { return m_browserContextRef; }
+    QSharedPointer<QtWebEngineCore::BrowserContextAdapter> browserContext() const;
     QQuickWebEngineSettings *settings() const { return m_settings.data(); }
 
     void cancelDownload(quint32 downloadId);
@@ -90,7 +91,7 @@ private:
     friend class QQuickWebEngineViewPrivate;
     QQuickWebEngineProfile *q_ptr;
     QScopedPointer<QQuickWebEngineSettings> m_settings;
-    QSharedPointer<QtWebEngineCore::BrowserContextAdapter> m_browserContextRef;
+    QPointer<QWebEngineBrowserContext> m_browserContext;
     QMap<quint32, QPointer<QQuickWebEngineDownloadItem> > m_ongoingDownloads;
     QList<QQuickWebEngineScript *> m_userScripts;
 };