No bug - Formatting previously unformatted code, rs=me

--HG--
extra : rebase_source : 1e1b09be48970bfc6774c0425f1d53c2b5af8e9e
extra : source : 2155ec716d342f75b93d3f44f1945a0746e39495
extra : histedit_source : 58f5f716007067684f57a7155f67fab7d029180e
This commit is contained in:
Anny Gakhokidze 2019-09-11 16:18:19 +02:00
Родитель 51c0772fe6
Коммит dabe852c9a
4 изменённых файлов: 12 добавлений и 9 удалений

Просмотреть файл

@ -11114,7 +11114,8 @@ nsresult nsDocShell::UpdateURLAndHistory(Document* aDocument, nsIURI* aNewURI,
// true for aCloneChildren.
rv = AddToSessionHistory(aNewURI, nullptr,
aDocument->NodePrincipal(), // triggeringPrincipal
nullptr, nullptr, csp, true, getter_AddRefs(newSHEntry));
nullptr, nullptr, csp, true,
getter_AddRefs(newSHEntry));
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_TRUE(newSHEntry, NS_ERROR_FAILURE);
@ -11564,7 +11565,8 @@ nsresult nsDocShell::LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType) {
// Ensure that we have a triggeringPrincipal. Otherwise javascript:
// URIs will pick it up from the about:blank page we just loaded,
// and we don't really want even that in this case.
nsCOMPtr<nsIPrincipal> principal = NullPrincipal::CreateWithInheritedAttributes(this);
nsCOMPtr<nsIPrincipal> principal =
NullPrincipal::CreateWithInheritedAttributes(this);
loadState->SetTriggeringPrincipal(principal);
}
}

Просмотреть файл

@ -283,9 +283,10 @@ SHistoryChild::EvictAllContentViewers(void) {
}
NS_IMETHODIMP_(void)
SHistoryChild::EvictContentViewersOrReplaceEntry(nsISHEntry* aNewSHEntry, bool aReplace) {
SendEvictContentViewersOrReplaceEntry(
static_cast<SHEntryChild*>(aNewSHEntry), aReplace);
SHistoryChild::EvictContentViewersOrReplaceEntry(nsISHEntry* aNewSHEntry,
bool aReplace) {
SendEvictContentViewersOrReplaceEntry(static_cast<SHEntryChild*>(aNewSHEntry),
aReplace);
}
NS_IMETHODIMP_(void)

Просмотреть файл

@ -79,7 +79,8 @@ class SHistoryParent final : public PSHistoryParent {
MaybeNewPSHEntry* aEntry, int32_t* aIndex);
bool RecvEvict(nsTArray<PSHEntryParent*>&& aEntries);
bool RecvEnsureCorrectEntryAtCurrIndex(PSHEntryParent* aEntry);
bool RecvEvictContentViewersOrReplaceEntry(PSHEntryParent* aNewSHEntry, bool aReplace);
bool RecvEvictContentViewersOrReplaceEntry(PSHEntryParent* aNewSHEntry,
bool aReplace);
bool RecvNotifyListenersContentViewerEvicted(uint32_t aNumEvicted);
RefPtr<CanonicalBrowsingContext> mContext;

Просмотреть файл

@ -201,9 +201,8 @@ class nsSHistory : public mozilla::LinkedListElement<nsSHistory>,
// Track all bfcache entries and evict on expiration.
mozilla::UniquePtr<HistoryTracker> mHistoryTracker;
int32_t mIndex; // -1 means "no index"
int32_t mRequestedIndex; // -1 means "no requested index"
int32_t mIndex; // -1 means "no index"
int32_t mRequestedIndex; // -1 means "no requested index"
// Session History listeners
nsAutoTObserverArray<nsWeakPtr, 2> mListeners;