Bug 1669767 - Fallback on SessionHistoryInfo::mURI if we receive an empty title, r=peterv

Kashav Madan · Kashav Madan · commit 72c025a35158 · 2020-10-13T14:47:51.000Z
This now mirrors nsSHEntry::GetTitle. Differential Revision: https://phabricator.services.mozilla.com/D92785
diff --git a/browser/components/sessionstore/test/browser.ini b/browser/components/sessionstore/test/browser.ini
@@ -137,7 +137,6 @@ skip-if = fission
 [browser_sessionHistory.js]
 support-files =
   file_sessionHistory_hashchange.html
-skip-if = fission
 [browser_sessionStorage.js]
 fail-if = fission
 [browser_sessionStorage_size.js]
diff --git a/docshell/shistory/SessionHistoryEntry.cpp b/docshell/shistory/SessionHistoryEntry.cpp
@@ -435,7 +435,7 @@ SessionHistoryEntry::GetTitle(nsAString& aTitle) {
 
 NS_IMETHODIMP
 SessionHistoryEntry::SetTitle(const nsAString& aTitle) {
-  mInfo->mTitle = aTitle;
+  mInfo->SetTitle(aTitle);
   return NS_OK;
 }
 
diff --git a/docshell/shistory/SessionHistoryEntry.h b/docshell/shistory/SessionHistoryEntry.h
@@ -74,7 +74,10 @@ class SessionHistoryInfo {
     return mScrollRestorationIsManual;
   }
   const nsAString& GetTitle() { return mTitle; }
-  void SetTitle(const nsAString& aTitle) { mTitle = aTitle; }
+  void SetTitle(const nsAString& aTitle) {
+    mTitle = aTitle;
+    MaybeUpdateTitleFromURI();
+  }
 
   const nsAString& GetName() { return mName; }
   void SetName(const nsAString& aName) { mName = aName; }

Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ SessionHistoryEntry::GetTitle(nsAString& aTitle) {`
`435`	`435`
`436`	`436`	`NS_IMETHODIMP`
`437`	`437`	`SessionHistoryEntry::SetTitle(const nsAString& aTitle) {`
`438`		`- mInfo->mTitle = aTitle;`
	`438`	`+ mInfo->SetTitle(aTitle);`
`439`	`439`	`return NS_OK;`
`440`	`440`	`}`
`441`	`441`