diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-25 07:32:25 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-25 07:32:25 (GMT) |
commit | 559f44abace0203a1930c71ec1040855dd1db573 (patch) | |
tree | 03d71ffe33dbf4792f0cef86906c48b76692ed3f /src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp | |
parent | 6d6b7b318a842ef5037065554f30ebfb4ae34d74 (diff) | |
download | Qt-559f44abace0203a1930c71ec1040855dd1db573.zip Qt-559f44abace0203a1930c71ec1040855dd1db573.tar.gz Qt-559f44abace0203a1930c71ec1040855dd1db573.tar.bz2 |
Updated WebKit to 807157e42add842605ec67d9363dd3f1861748ca
* Changes integrated:
|| <https://webkit.org/b/24289> || [Qt] lacks clipToImageBuffer() ||
|| <https://webkit.org/b/38641> || [Qt] Nested overflow div does not scroll ||
|| <https://webkit.org/b/37322> || [Qt] tst_QWebHistory::serialize_2() fails ||
|| <https://webkit.org/b/35340> || [Qt] Enable alternate HTML/JavaScript front-ends for Web Inspector ||
|| <https://webkit.org/b/39314> || [Qt] Skipping popup focus test for maemo ||
|| <https://webkit.org/b/39150> || Canvas's getContext() must return null when called with an invalid/unsupported parameter ||
|| <https://webkit.org/b/39153> || Canvas's toDataURL() should be case insensitive wrt the mimeType argument ||
|| <https://webkit.org/b/39218> || [Qt] Tiled backing store tiles sometimes flicker when exiting a zoom animation ||
|| <https://webkit.org/b/38456> || [Qt] QtTestBrowser does not support websites which requires HTTP Authentication via dialogs ||
|| <https://webkit.org/b/37273> || [Qt] Weekly binary builds on Mac OS X don't work when launched in the Finder ||
|| <https://webkit.org/b/38779> || [Qt] QWebPage::inputMethodQuery() returns wrong values for Qt::ImCursorPosition, Qt::ImAnchorPosition ||
|| <https://webkit.org/b/38526> || [Qt] REGRESSION: CoolClock isn't rendered properly ||
Plus def file fixes.
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp')
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp index d852012..06e6cfa 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp @@ -540,6 +540,8 @@ QDataStream& operator>>(QDataStream& source, QWebHistory& history) d->lst->addItem(item); } d->lst->removeItem(nullItem); + // Update the HistoryController. + history.d->lst->page()->mainFrame()->loader()->history()->setCurrentItem(history.d->lst->entries()[currentIndex].get()); history.goToItem(history.itemAt(currentIndex)); } } |