From 3f69bf43c45e54789ce6cdc4a2f01ea129e6287c Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Fri, 21 Mar 2014 14:11:50 +0100
Subject: 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>
---
 src/webenginewidgets/api/qwebenginehistory_p.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/webenginewidgets/api/qwebenginehistory_p.h')

diff --git a/src/webenginewidgets/api/qwebenginehistory_p.h b/src/webenginewidgets/api/qwebenginehistory_p.h
index 42f3ff73c..fd15f103f 100644
--- a/src/webenginewidgets/api/qwebenginehistory_p.h
+++ b/src/webenginewidgets/api/qwebenginehistory_p.h
@@ -44,27 +44,26 @@
 
 #include <QtCore/qshareddata.h>
 
-class WebContentsAdapter;
-
 QT_BEGIN_NAMESPACE
+class QWebEnginePagePrivate;
 
 class QWebEngineHistoryItemPrivate : public QSharedData
 {
 public:
-    QWebEngineHistoryItemPrivate(WebContentsAdapter *adapter = 0, int index = 0);
+    QWebEngineHistoryItemPrivate(QWebEnginePagePrivate *page = 0, int index = 0);
 
-    WebContentsAdapter *adapter;
+    QWebEnginePagePrivate *page;
     int index;
 };
 
 class QWebEngineHistoryPrivate
 {
 public:
-    QWebEngineHistoryPrivate(WebContentsAdapter *adapter);
+    QWebEngineHistoryPrivate(QWebEnginePagePrivate *page);
     ~QWebEngineHistoryPrivate();
     void updateItems() const;
 
-    WebContentsAdapter *adapter;
+    QWebEnginePagePrivate *page;
     mutable QList<QWebEngineHistoryItem> items;
 };
 
-- 
cgit v1.2.3