diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-06-01 15:54:01 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-06-02 14:07:43 +0000 |
| commit | 0a3506ebe5d7f431f0dd4dffa24ac32063b90ff1 (patch) | |
| tree | f3d0b92fe7bc5b31426a838c354616fff335e82b /Source/WebKit2/UIProcess/WebBackForwardList.cpp | |
| parent | 881da28418d380042aa95a97f0cbd42560a64f7c (diff) | |
| download | qtwebkit-0a3506ebe5d7f431f0dd4dffa24ac32063b90ff1.tar.gz | |
Import WebKit commit 3ca7a25a550e473d60bbbe321475c6c0ef114b31
Change-Id: I480668a0cb8114dccf7a1195190a993282875759
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'Source/WebKit2/UIProcess/WebBackForwardList.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/WebBackForwardList.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/WebBackForwardList.cpp b/Source/WebKit2/UIProcess/WebBackForwardList.cpp index 273431232..033b392b5 100644 --- a/Source/WebKit2/UIProcess/WebBackForwardList.cpp +++ b/Source/WebKit2/UIProcess/WebBackForwardList.cpp @@ -416,6 +416,8 @@ BackForwardListState WebBackForwardList::backForwardListState(const std::functio if (backForwardListState.items.isEmpty()) backForwardListState.currentIndex = Nullopt; + else if (backForwardListState.items.size() <= backForwardListState.currentIndex.value()) + backForwardListState.currentIndex = backForwardListState.items.size() - 1; return backForwardListState; } |