diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-23 15:08:59 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-23 15:09:20 +0100 |
| commit | 061d58bc0fa016cfeed744fd3e4663460635d69b (patch) | |
| tree | ad9b8b032c803e1c9054c23fa1b7a0f1976bf98f /Source/WebKit/qt/Api/qwebhistory.cpp | |
| parent | 470286ecfe79d59df14944e5b5d34630fc739391 (diff) | |
| download | qtwebkit-061d58bc0fa016cfeed744fd3e4663460635d69b.tar.gz | |
Imported WebKit commit 8eb048315f36fa33731f28694630fe4a3c2cbc99 (http://svn.webkit.org/repository/webkit/trunk@135602)
New snapshot that fixes various bugs
Change-Id: Icb6ce541a26a9f500d087821ce4b83a8d8a5474a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit/qt/Api/qwebhistory.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebhistory.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/WebKit/qt/Api/qwebhistory.cpp b/Source/WebKit/qt/Api/qwebhistory.cpp index f7849666e..a945b592b 100644 --- a/Source/WebKit/qt/Api/qwebhistory.cpp +++ b/Source/WebKit/qt/Api/qwebhistory.cpp @@ -20,15 +20,16 @@ #include "config.h" #include "qwebhistory.h" #include "qwebhistory_p.h" -#include "qwebframe_p.h" #include "BackForwardListImpl.h" +#include "Frame.h" #include "IconDatabaseBase.h" #include "Image.h" #include "IntSize.h" #include "KURL.h" #include "Page.h" #include "PageGroup.h" +#include <QWebPageAdapter.h> #include <wtf/text/WTFString.h> #include <QSharedData> @@ -552,9 +553,9 @@ QDataStream& operator>>(QDataStream& source, QWebHistory& history) return source; } -QWebPagePrivate* QWebHistoryPrivate::page() +QWebPageAdapter* QWebHistoryPrivate::page() { - return QWebFramePrivate::kit(static_cast<WebCore::BackForwardListImpl*>(lst)->page()->mainFrame())->page()->handle(); + return QWebPageAdapter::kit(static_cast<WebCore::BackForwardListImpl*>(lst)->page()); } WebCore::HistoryItem* QWebHistoryItemPrivate::core(const QWebHistoryItem* q) |