Backed out changeset ecd780688279 (bug 1875100) for causing mochitest failures in test_suspend_media_by_inactive_docshell.html

Author: Cristian Tuns

browser/base/content/tabbrowser.js

@@ -2094,6 +2094,7 @@
       uriIsAboutBlank,
       userContextId,
       skipLoad,
+      initiallyActive,
     } = {}) {
       let b = document.createXULElement("browser");
       // Use the JSM global to create the permanentKey, so that if the
@@ -2119,7 +2120,6 @@
         messagemanagergroup: "browsers",
         tooltip: "aHTMLTooltip",
         type: "content",
-        manualactiveness: "true",
       };
       for (let attribute in defaultBrowserAttributes) {
         b.setAttribute(attribute, defaultBrowserAttributes[attribute]);
@@ -2129,6 +2129,10 @@
         b.setAttribute("maychangeremoteness", "true");
       }
 
+      if (!initiallyActive) {
+        b.setAttribute("initiallyactive", "false");
+      }
+
       if (userContextId) {
         b.setAttribute("usercontextid", userContextId);
       }

browser/base/content/test/fullscreen/FullscreenFrame.sys.mjs

@@ -43,6 +43,7 @@ export class FullscreenFrameChild extends JSWindowActorChild {
       case "ExitFullscreen":
         return this.contentWindow.document.exitFullscreen();
       case "RequestFullscreen":
+        this.browsingContext.isActive = true;
         return Promise.all([this.changed(), this.requestFullscreen()]);
       case "CreateChild":
         let child = msg.data;

browser/components/extensions/test/browser/browser.toml

@@ -307,8 +307,6 @@ skip-if = [
   "verify && !debug && os == 'mac'",
 ]
 
-["browser_ext_optionsPage_activity.js"]
-
 ["browser_ext_optionsPage_browser_style.js"]
 
 ["browser_ext_optionsPage_links_open_in_tabs.js"]

browser/components/extensions/test/browser/browser_ext_optionsPage_activity.js

@@ -341,10 +341,11 @@ class ShoppingSidebarManagerClass {
     if (!sidebar) {
       return;
     }
+    let { browsingContext } = sidebar.querySelector("browser");
     try {
       // Tell Gecko when the sidebar visibility changes to avoid background
       // sidebars taking more CPU / energy than needed.
-      sidebar.querySelector("browser").docShellIsActive =
+      browsingContext.isActive =
         !document.hidden &&
         aBrowser == gBrowser.selectedBrowser &&
         !sidebar.hidden;

browser/components/shopping/ShoppingSidebarParent.sys.mjs

@@ -22,7 +22,6 @@
           disablehistory="true"
           flex="1"
           message="true"
-          manualactiveness="true"
           remoteType="privilegedabout"
           maychangeremoteness="true"
           remote="true"

browser/components/shopping/content/shopping-sidebar.js

@@ -422,13 +422,15 @@ already_AddRefed<BrowsingContext> BrowsingContext::CreateDetached(
 
   fields.Get<IDX_HistoryID>() = nsID::GenerateUUID();
   fields.Get<IDX_ExplicitActive>() = [&] {
-    if (parentBC || aType == Type::Content) {
+    if (parentBC) {
       // Non-root browsing-contexts inherit their status from its parent.
-      // Top-content either gets managed by the top chrome, or gets manually
-      // managed by the front-end (see ManuallyManagesActiveness). In any case
-      // we want to start off as inactive.
       return ExplicitActiveStatus::None;
     }
+    if (aType == Type::Content) {
+      // Content gets managed by the chrome front-end / embedder element and
+      // starts as inactive.
+      return ExplicitActiveStatus::Inactive;
+    }
     // Chrome starts as active.
     return ExplicitActiveStatus::Active;
   }();
@@ -737,24 +739,21 @@ void BrowsingContext::SetEmbedderElement(Element* aEmbedder) {
       txn.SetEmbedderInnerWindowId(inner->WindowID());
     }
     txn.SetFullscreenAllowedByOwner(OwnerAllowsFullscreen(*aEmbedder));
-    if (XRE_IsParentProcess() && aEmbedder->IsXULElement() && IsTopContent()) {
+    if (XRE_IsParentProcess() && IsTopContent()) {
       nsAutoString messageManagerGroup;
-      aEmbedder->GetAttr(nsGkAtoms::messagemanagergroup, messageManagerGroup);
-      txn.SetMessageManagerGroup(messageManagerGroup);
-      txn.SetUseGlobalHistory(
-          !aEmbedder->HasAttr(nsGkAtoms::disableglobalhistory));
-      if (!aEmbedder->HasAttr(nsGkAtoms::manualactiveness)) {
-        // We're active iff the parent cross-chrome-boundary is active. Note we
-        // can't just use this->Canonical()->GetParentCrossChromeBoundary here,
-        // since mEmbedderElement is still null at this point.
-        RefPtr bc = aEmbedder->OwnerDoc()->GetBrowsingContext();
-        const bool isActive = bc && bc->IsActive();
-        txn.SetExplicitActive(isActive ? ExplicitActiveStatus::Active
-                                       : ExplicitActiveStatus::Inactive);
-        if (auto* bp = Canonical()->GetBrowserParent()) {
-          bp->SetRenderLayers(isActive);
+      if (aEmbedder->IsXULElement()) {
+        aEmbedder->GetAttr(nsGkAtoms::messagemanagergroup, messageManagerGroup);
+        if (!aEmbedder->AttrValueIs(kNameSpaceID_None,
+                                    nsGkAtoms::initiallyactive,
+                                    nsGkAtoms::_false, eIgnoreCase)) {
+          txn.SetExplicitActive(ExplicitActiveStatus::Active);
         }
       }
+      txn.SetMessageManagerGroup(messageManagerGroup);
+
+      bool useGlobalHistory =
+          !aEmbedder->HasAttr(nsGkAtoms::disableglobalhistory);
+      txn.SetUseGlobalHistory(useGlobalHistory);
     }
 
     MOZ_ALWAYS_SUCCEEDS(txn.Commit(this));
@@ -2635,16 +2634,8 @@ void BrowsingContext::DidSet(FieldIndex<IDX_GVInaudibleAutoplayRequestStatus>) {
              "browsing context");
 }
 
-bool BrowsingContext::CanSet(FieldIndex<IDX_ExplicitActive>,
-                             const ExplicitActiveStatus&,
-                             ContentParent* aSource) {
-  return XRE_IsParentProcess() && IsTop() && !aSource;
-}
-
 void BrowsingContext::DidSet(FieldIndex<IDX_ExplicitActive>,
                              ExplicitActiveStatus aOldValue) {
-  MOZ_ASSERT(IsTop());
-
   const bool isActive = IsActive();
   const bool wasActive = [&] {
     if (aOldValue != ExplicitActiveStatus::None) {
@@ -2657,43 +2648,32 @@ void BrowsingContext::DidSet(FieldIndex<IDX_ExplicitActive>,
     return;
   }
 
-  Group()->UpdateToplevelsSuspendedIfNeeded();
-  if (XRE_IsParentProcess()) {
-    if (BrowserParent* bp = Canonical()->GetBrowserParent()) {
-      bp->RecomputeProcessPriority();
+  if (IsTop()) {
+    Group()->UpdateToplevelsSuspendedIfNeeded();
+
+    if (XRE_IsParentProcess()) {
+      auto* bc = Canonical();
+      if (BrowserParent* bp = bc->GetBrowserParent()) {
+        bp->RecomputeProcessPriority();
 #if defined(XP_WIN) && defined(ACCESSIBILITY)
-      if (a11y::Compatibility::IsDolphin()) {
-        // update active accessible documents on windows
-        if (a11y::DocAccessibleParent* tabDoc =
-                bp->GetTopLevelDocAccessible()) {
-          HWND window = tabDoc->GetEmulatedWindowHandle();
-          MOZ_ASSERT(window);
-          if (window) {
-            if (isActive) {
-              a11y::nsWinUtils::ShowNativeWindow(window);
-            } else {
-              a11y::nsWinUtils::HideNativeWindow(window);
+        if (a11y::Compatibility::IsDolphin()) {
+          // update active accessible documents on windows
+          if (a11y::DocAccessibleParent* tabDoc =
+                  bp->GetTopLevelDocAccessible()) {
+            HWND window = tabDoc->GetEmulatedWindowHandle();
+            MOZ_ASSERT(window);
+            if (window) {
+              if (isActive) {
+                a11y::nsWinUtils::ShowNativeWindow(window);
+              } else {
+                a11y::nsWinUtils::HideNativeWindow(window);
+              }
             }
           }
         }
-      }
 #endif
-    }
-
-    // NOTE(emilio): Ideally we'd want to reuse the ExplicitActiveStatus::None
-    // set-up, but that's non-trivial to do because in content processes we
-    // can't access the top-cross-chrome-boundary bc.
-    auto manageTopDescendant = [&](auto* aChild) {
-      if (!aChild->ManuallyManagesActiveness()) {
-        aChild->SetIsActiveInternal(isActive, IgnoreErrors());
-        if (BrowserParent* bp = aChild->GetBrowserParent()) {
-          bp->SetRenderLayers(isActive);
-        }
       }
-      return CallState::Continue;
-    };
-    Canonical()->CallOnAllTopDescendants(manageTopDescendant,
-                                         /* aIncludeNestedBrowsers = */ false);
+    }
   }
 
   PreOrderWalk([&](BrowsingContext* aContext) {

docshell/base/BrowsingContext.cpp

@@ -606,6 +606,12 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
   }
 
   bool IsActive() const;
+  void SetIsActive(bool aIsActive, mozilla::ErrorResult& aRv) {
+    SetExplicitActive(aIsActive ? ExplicitActiveStatus::Active
+                                : ExplicitActiveStatus::Inactive,
+                      aRv);
+  }
+
   bool ForceOffline() const { return GetForceOffline(); }
 
   bool ForceDesktopViewport() const { return GetForceDesktopViewport(); }
@@ -1109,8 +1115,6 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
 
   void DidSet(FieldIndex<IDX_DisplayMode>, enum DisplayMode aOldValue);
 
-  bool CanSet(FieldIndex<IDX_ExplicitActive>, const ExplicitActiveStatus&,
-              ContentParent* aSource);
   void DidSet(FieldIndex<IDX_ExplicitActive>, ExplicitActiveStatus aOldValue);
 
   bool CanSet(FieldIndex<IDX_IsActiveBrowserWindowInternal>, const bool& aValue,