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

Backed out changeset efdaaeb6ecf2 (bug 1804803) for causing Bug 1812257. a=backout

Browse Source
This commit is contained in:
Stanca Serban
2023-01-25 11:41:08 +02:00
parent be962a21e8
commit 28cbcc3fc4
8 changed files with 73 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
docshell/shistory/SessionHistoryEntry.cpp
View File

@@ -395,7 +395,7 @@ LoadingSessionHistoryInfo::LoadingSessionHistoryInfo(
mLoadIsFromSessionHistory(aInfo->mLoadIsFromSessionHistory),
mOffset(aInfo->mOffset),
mLoadingCurrentEntry(aInfo->mLoadingCurrentEntry) {
MOZ_ASSERT(SessionHistoryEntry::GetByLoadId(mLoadId)->mEntry == aEntry);
MOZ_ASSERT(SessionHistoryEntry::GetByLoadId(mLoadId) == aEntry);
}
LoadingSessionHistoryInfo::LoadingSessionHistoryInfo(
@@ -416,14 +416,29 @@ LoadingSessionHistoryInfo::CreateLoadInfo() const {
static uint32_t gEntryID;
SessionHistoryEntry::LoadingEntry* SessionHistoryEntry::GetByLoadId(
uint64_t aLoadId) {
SessionHistoryEntry* SessionHistoryEntry::GetByLoadId(uint64_t aLoadId) {
MOZ_ASSERT(XRE_IsParentProcess());
if (!sLoadIdToEntry) {
return nullptr;
}
return sLoadIdToEntry->Lookup(aLoadId).DataPtrOrNull();
if (auto entry = sLoadIdToEntry->Lookup(aLoadId)) {
return entry->mEntry;
}
return nullptr;
}
const SessionHistoryInfo*
SessionHistoryEntry::GetInfoSnapshotForValidationByLoadId(uint64_t aLoadId) {
MOZ_ASSERT(XRE_IsParentProcess());
if (!sLoadIdToEntry) {
return nullptr;
}
if (auto entry = sLoadIdToEntry->Lookup(aLoadId)) {
return entry->mInfoSnapshotForValidation.get();
}
return nullptr;
}
void SessionHistoryEntry::SetByLoadId(uint64_t aLoadId,