diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-03-21 14:11:50 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 16:43:52 +0200 |
commit | 3f69bf43c45e54789ce6cdc4a2f01ea129e6287c (patch) | |
tree | a371f31bdd9ab74f44bba3c2d41382b22877c583 /src/webenginewidgets/api/qwebenginepage.cpp | |
parent | 484f2d8c92e57cbe2c581a65a2ccf461eb68c883 (diff) |
Do not store a WebContentsAdapter directly in QWebEngineHistory
The adapter might change, while the page association should
always remain.
Change-Id: Ib2b49c599d497864484dd6758f47473d70fe4cb3
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index a514882d6..b6c84de6c 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -149,7 +149,7 @@ void CallbackDirectory::CallbackSharedDataPointer::doDeref() QWebEnginePagePrivate::QWebEnginePagePrivate() : QObjectPrivate(QObjectPrivateVersion) , adapter(new WebContentsAdapter(SoftwareRenderingMode)) - , history(new QWebEngineHistory(new QWebEngineHistoryPrivate(adapter.data()))) + , history(new QWebEngineHistory(new QWebEngineHistoryPrivate(this))) , view(0) { memset(actions, 0, sizeof(actions)); @@ -252,7 +252,6 @@ void QWebEnginePagePrivate::adoptNewWindow(WebContentsAdapter *newWebContents, W // Overwrite the new page's WebContents with ours. if (newPage) { newPage->d_func()->adapter = newWebContents; - newPage->history()->d_func()->adapter = newWebContents; newWebContents->initialize(newPage->d_func()); if (!initialGeometry.isEmpty()) emit newPage->geometryChangeRequested(initialGeometry); |