Bug 1670933 - Back button is not enabled by iframe navigation when Fission is enabled. r=smaug,extension-reviewers,zombie

Differential Revision: https://phabricator.services.mozilla.com/D95322

docshell/base/CanonicalBrowsingContext.cpp

@@ -369,6 +369,8 @@ CanonicalBrowsingContext::CreateLoadingSessionHistoryEntryForLoad(
       // Only top level pages care about Get/SetPersist.
       entry->SetPersist(
           nsDocShell::ShouldAddToSessionHistory(aLoadState->URI(), aChannel));
+    } else if (mActiveEntry || !mLoadingEntries.IsEmpty()) {
+      entry->SetIsSubFrame(true);
     }
     entry->SetDocshellID(GetHistoryID());
     entry->SetIsDynamicallyAdded(CreatedDynamically());
@@ -406,6 +408,8 @@ CanonicalBrowsingContext::ReplaceLoadingSessionHistoryEntryForLoad(
     nsCOMPtr<nsIURI> uri;
     aChannel->GetURI(getter_AddRefs(uri));
     newEntry->SetPersist(nsDocShell::ShouldAddToSessionHistory(uri, aChannel));
+  } else {
+    newEntry->SetIsSubFrame(aInfo->mInfo.IsSubFrame());
   }
   newEntry->SetDocshellID(GetHistoryID());
   newEntry->SetIsDynamicallyAdded(CreatedDynamically());

docshell/base/nsDocShell.cpp

@@ -1407,11 +1407,11 @@ bool nsDocShell::SetCurrentURI(nsIURI* aURI, nsIRequest* aRequest,
   if (mozilla::SessionHistoryInParent()) {
     if (mLoadingEntry) {
       isSubFrame = mLoadingEntry->mInfo.IsSubFrame();
-      MOZ_LOG(gSHLog, LogLevel::Debug,
-              ("nsDocShell %p SetCurrentURI, isSubFrame=%d", this, isSubFrame));
+    } else {
+      isSubFrame = !mBrowsingContext->IsTop() && mActiveEntry;
     }
     MOZ_LOG(gSHLog, LogLevel::Debug,
-            ("nsDocShell %p SetCurrentURI, no mLoadingEntry", this));
+            ("nsDocShell %p SetCurrentURI, isSubFrame=%d", this, isSubFrame));
   } else {
     if (mLSHE) {
       isSubFrame = mLSHE->GetIsSubFrame();

dom/base/test/browser.ini

@@ -66,7 +66,6 @@ skip-if = verify
 [browser_timeout_throttling_with_audio_playback.js]
 skip-if = (os == "win" && processor == "aarch64") # aarch64 due to bug 1536566
 [browser_bug1303838.js]
-skip-if = fission
 [browser_inputStream_structuredClone.js]
 [browser_multiple_popups.js]
 skip-if = (os == 'win' && !debug) || (os == "mac" && !debug) # Bug 1505235, Bug 1661132 (osx)

toolkit/components/extensions/test/mochitest/mochitest-common.ini

@@ -159,7 +159,7 @@ skip-if = (os == 'android' && debug) || fission || (os  == "linux" && bits == 64
 [test_ext_web_accessible_incognito.html]
 skip-if = (os == 'android') || fission # Crashes intermittently: @ mozilla::dom::BrowsingContext::CreateFromIPC(mozilla::dom::BrowsingContext::IPCInitializer&&, mozilla::dom::BrowsingContextGroup*, mozilla::dom::ContentParent*), bug 1588284, bug 1397615 and bug 1513544
 [test_ext_webnavigation.html]
-skip-if = (os == 'android' && debug) || fission # bug 1397615
+skip-if = (os == 'android' && debug) # bug 1397615
 [test_ext_webnavigation_filters.html]
 skip-if = (os == 'android' && debug) || (verify && (os == 'linux' || os == 'mac')) # bug 1397615
 [test_ext_webnavigation_incognito.html]