corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1668577 - Make child process to send offset to parent process, not index, r=peterv

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D92074
This commit is contained in:
Olli Pettay
2020-10-02 16:15:47 +00:00
parent 804b5c8622
commit aee6f990e5
7 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docshell/base/CanonicalBrowsingContext.cpp
View File

@@ -6,6 +6,7 @@
#include "mozilla/dom/CanonicalBrowsingContext.h"
#include "mozilla/CheckedInt.h"
#include "mozilla/EventForwards.h"
#include "mozilla/AsyncEventDispatcher.h"
#include "mozilla/dom/BrowserParent.h"
@@ -654,14 +655,25 @@ void CanonicalBrowsingContext::RemoveFromSessionHistory() {
}
void CanonicalBrowsingContext::HistoryGo(
int32_t aIndex, std::function<void(int32_t&&)>&& aResolver) {
int32_t aOffset, std::function<void(int32_t&&)>&& aResolver) {
nsSHistory* shistory = static_cast<nsSHistory*>(GetSessionHistory());
if (!shistory) {
return;
}
CheckedInt<int32_t> index = shistory->GetRequestedIndex() >= 0
? shistory->GetRequestedIndex()
: shistory->Index();
index += aOffset;
if (!index.isValid()) {
return;
}
// FIXME userinteraction bits may needs tweaks here.
// GoToIndex checks that index is >= 0 and < length.
nsTArray<nsSHistory::LoadEntryResult> loadResults;
nsresult rv = shistory->GotoIndex(aIndex, loadResults);
nsresult rv = shistory->GotoIndex(index.value(), loadResults);
if (NS_FAILED(rv)) {
return;
}