Bug 1743663 - Remove windowContext.hasActivePeerConnections. r=peterv

TabUnloader.jsm can directly call windowGlobal.hasActivePeerConnections(), so windowContext.hasActivePeerConnections is not needed. Differential Revision: https://phabricator.services.mozilla.com/D132654
dothq · Dec 16, 2021 · baa43db · baa43db
1 parent d0c8a06
commit baa43db
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/browser/modules/TabUnloader.jsm b/browser/modules/TabUnloader.jsm
@@ -89,7 +89,7 @@ let DefaultTabUnloaderMethods = {
     // No need to iterate browser contexts for hasActivePeerConnection
     // because hasActivePeerConnection is set only in the top window.
     return webrtcUI.browserHasStreams(browser) ||
-      browser.browsingContext?.topWindowContext?.hasActivePeerConnections
+      browser.browsingContext?.currentWindowGlobal?.hasActivePeerConnections()
       ? weight
       : 0;
   },

diff --git a/docshell/base/WindowContext.cpp b/docshell/base/WindowContext.cpp
@@ -68,12 +68,6 @@ bool WindowContext::IsCurrent() const {
   return mBrowsingContext->mCurrentWindowContext == this;
 }
 
-bool WindowContext::HasActivePeerConnections() {
-  MOZ_ASSERT(TopWindowContext() == this,
-             "HasActivePeerConnections is set only in the top window context");
-  return Canonical()->HasActivePeerConnections();
-}
-
 bool WindowContext::IsInBFCache() {
   if (mozilla::SessionHistoryInParent()) {
     return mBrowsingContext->IsInBFCache();

diff --git a/docshell/base/WindowContext.h b/docshell/base/WindowContext.h
@@ -197,8 +197,6 @@ class WindowContext : public nsISupports, public nsWrapperCache {
 
   bool HadLazyLoadImage() const { return GetHadLazyLoadImage(); }
 
-  bool HasActivePeerConnections();
-
   bool AllowJavascript() const { return GetAllowJavascript(); }
   bool CanExecuteScripts() const { return mCanExecuteScripts; }
 

diff --git a/dom/chrome-webidl/WindowGlobalActors.webidl b/dom/chrome-webidl/WindowGlobalActors.webidl
@@ -33,11 +33,6 @@ interface WindowContext {
   // It won't become false if the image becomes non-lazy.
   readonly attribute boolean hadLazyLoadImage;
 
-  // True if any of the windows in the subtree rooted at this window
-  // has active peer connections.  If this is called for a non-top-level
-  // context, it always returns false.
-  readonly attribute boolean hasActivePeerConnections;
-
   /**
    * Partially determines whether script execution is allowed in this
    * BrowsingContext. Script execution will be permitted only if this
@@ -162,6 +157,11 @@ interface WindowGlobalParent : WindowContext {
    */
   [Throws]
   Promise<nsITransportSecurityInfo> getSecurityInfo();
+
+  // True if any of the windows in the subtree rooted at this window
+  // has active peer connections.  If this is called for a non-top-level
+  // context, it always returns false.
+  boolean hasActivePeerConnections();
 };
 
 [Exposed=Window, ChromeOnly]

diff --git a/dom/tests/browser/browser_hasActivePeerConnections.js b/dom/tests/browser/browser_hasActivePeerConnections.js
@@ -8,11 +8,11 @@ const TEST_URI2 =
 
 add_task(async () => {
   await BrowserTestUtils.withNewTab(TEST_URI1, async browser => {
-    const topWindow = browser.browsingContext.topWindowContext;
-    Assert.ok(topWindow);
+    const windowGlobal = browser.browsingContext.currentWindowGlobal;
+    Assert.ok(windowGlobal);
 
     Assert.strictEqual(
-      topWindow.hasActivePeerConnections,
+      windowGlobal.hasActivePeerConnections(),
       false,
       "No active connections at the beginning"
     );
@@ -30,7 +30,7 @@ add_task(async () => {
     });
 
     Assert.strictEqual(
-      topWindow.hasActivePeerConnections,
+      windowGlobal.hasActivePeerConnections(),
       true,
       "One connection in the top window"
     );
@@ -48,7 +48,7 @@ add_task(async () => {
     });
 
     Assert.strictEqual(
-      topWindow.hasActivePeerConnections,
+      windowGlobal.hasActivePeerConnections(),
       false,
       "All connections have been closed"
     );
@@ -106,7 +106,7 @@ add_task(async () => {
     );
 
     Assert.strictEqual(
-      topWindow.hasActivePeerConnections,
+      windowGlobal.hasActivePeerConnections(),
       true,
       "#iframe-cross-origin still has an active connection"
     );
@@ -126,7 +126,7 @@ add_task(async () => {
     });
 
     Assert.strictEqual(
-      topWindow.hasActivePeerConnections,
+      windowGlobal.hasActivePeerConnections(),
       false,
       "All connections have been closed"
     );