No bug - Formatting previously unformatted code, rs=me
authorAnny Gakhokidze <agakhokidze@mozilla.com>
Wed, 11 Sep 2019 16:18:19 +0200
changeset 500508 e2c223e48fe0f4a8718eca7cd0caea923eaf65b3
parent 500507 81637d1074d5ebb90fa81ce8df71d79fbb796e57
child 500509 325fca25e08dd2757735a17a8b8a6c7ce98f53ac
push id114165
push userpvanderbeken@mozilla.com
push dateWed, 06 Nov 2019 09:18:40 +0000
treeherdermozilla-inbound@db1ddab2985d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
milestone72.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
No bug - Formatting previously unformatted code, rs=me
docshell/base/nsDocShell.cpp
docshell/shistory/SHistoryChild.cpp
docshell/shistory/SHistoryParent.h
docshell/shistory/nsSHistory.h
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -11109,17 +11109,18 @@ nsresult nsDocShell::UpdateURLAndHistory
     MOZ_ASSERT(NS_SUCCEEDED(rv), "Didn't expect this to fail.");
 
     nsCOMPtr<nsIContentSecurityPolicy> csp = aDocument->GetCsp();
 
     // Since we're not changing which page we have loaded, pass
     // 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);
 
     // Session history entries created by pushState inherit scroll restoration
     // mode from the current entry.
     newSHEntry->SetScrollRestorationIsManual(scrollRestorationIsManual);
 
@@ -11559,17 +11560,18 @@ nsresult nsDocShell::LoadHistoryEntry(ns
       // user prevented it). Interrupt the history load.
       return NS_OK;
     }
 
     if (!loadState->TriggeringPrincipal()) {
       // 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);
     }
   }
 
   /* If there is a valid postdata *and* the user pressed
    * reload or shift-reload, take user's permission before we
    * repost the data to the server.
    */
--- a/docshell/shistory/SHistoryChild.cpp
+++ b/docshell/shistory/SHistoryChild.cpp
@@ -278,19 +278,20 @@ SHistoryChild::EvictAllContentViewers(vo
 
   nsTArray<PSHEntryChild*> pshEntries;
   pshEntries.AppendElements(shEntries);
   SendEvict(pshEntries);
   return NS_OK;
 }
 
 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)
 SHistoryChild::AddToExpirationTracker(nsIBFCacheEntry* aBFEntry) {
   RefPtr<SHEntryChildShared> entry = static_cast<SHEntryChildShared*>(aBFEntry);
   if (mHistoryTracker && entry) {
     mHistoryTracker->AddObject(entry);
   }
--- a/docshell/shistory/SHistoryParent.h
+++ b/docshell/shistory/SHistoryParent.h
@@ -74,17 +74,18 @@ class SHistoryParent final : public PSHi
   bool RecvRemoveFrameEntries(PSHEntryParent* aEntry);
   bool RecvReload(const uint32_t& aReloadFlags, LoadSHEntryResult* aLoadResult);
   bool RecvGetAllEntries(nsTArray<MaybeNewPSHEntry>* aEntries);
   bool RecvFindEntryForBFCache(const uint64_t& aSharedID,
                                const bool& aIncludeCurrentEntry,
                                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;
   RefPtr<LegacySHistory> mHistory;
 };
 
 }  // namespace dom
 }  // namespace mozilla
--- a/docshell/shistory/nsSHistory.h
+++ b/docshell/shistory/nsSHistory.h
@@ -196,19 +196,18 @@ class nsSHistory : public mozilla::Linke
   int32_t Length() { return int32_t(mEntries.Length()); }
 
   bool mIsRemote;
   nsTArray<nsCOMPtr<nsISHEntry>> mEntries;  // entries are never null
  private:
   // 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;
 
   // Weak reference. Do not refcount this.
   mozilla::dom::BrowsingContext* mRootBC;
   nsID mRootDocShellID;