diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 7b7671413a28..84ae1496df66 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -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 principal = NullPrincipal::CreateWithInheritedAttributes(this); + nsCOMPtr principal = + NullPrincipal::CreateWithInheritedAttributes(this); loadState->SetTriggeringPrincipal(principal); } } diff --git a/docshell/shistory/SHistoryChild.cpp b/docshell/shistory/SHistoryChild.cpp index 626280179328..6d2735116273 100644 --- a/docshell/shistory/SHistoryChild.cpp +++ b/docshell/shistory/SHistoryChild.cpp @@ -283,9 +283,10 @@ SHistoryChild::EvictAllContentViewers(void) { } NS_IMETHODIMP_(void) -SHistoryChild::EvictContentViewersOrReplaceEntry(nsISHEntry* aNewSHEntry, bool aReplace) { - SendEvictContentViewersOrReplaceEntry( - static_cast(aNewSHEntry), aReplace); +SHistoryChild::EvictContentViewersOrReplaceEntry(nsISHEntry* aNewSHEntry, + bool aReplace) { + SendEvictContentViewersOrReplaceEntry(static_cast(aNewSHEntry), + aReplace); } NS_IMETHODIMP_(void) diff --git a/docshell/shistory/SHistoryParent.h b/docshell/shistory/SHistoryParent.h index 428884bbe7e5..75cb1810cfdc 100644 --- a/docshell/shistory/SHistoryParent.h +++ b/docshell/shistory/SHistoryParent.h @@ -79,7 +79,8 @@ class SHistoryParent final : public PSHistoryParent { MaybeNewPSHEntry* aEntry, int32_t* aIndex); bool RecvEvict(nsTArray&& aEntries); bool RecvEnsureCorrectEntryAtCurrIndex(PSHEntryParent* aEntry); - bool RecvEvictContentViewersOrReplaceEntry(PSHEntryParent* aNewSHEntry, bool aReplace); + bool RecvEvictContentViewersOrReplaceEntry(PSHEntryParent* aNewSHEntry, + bool aReplace); bool RecvNotifyListenersContentViewerEvicted(uint32_t aNumEvicted); RefPtr mContext; diff --git a/docshell/shistory/nsSHistory.h b/docshell/shistory/nsSHistory.h index 0b8868ef31c2..79c4cdb65153 100644 --- a/docshell/shistory/nsSHistory.h +++ b/docshell/shistory/nsSHistory.h @@ -201,9 +201,8 @@ class nsSHistory : public mozilla::LinkedListElement, // Track all bfcache entries and evict on expiration. mozilla::UniquePtr 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 mListeners;