Bug 1646601 move fully active predicate to nsPIDOMWindowInner r=farre

Depends on D90216 Differential Revision: https://phabricator.services.mozilla.com/D90217
dothq · Sep 15, 2020 · 9e13b21 · 9e13b21
1 parent 820dfc0
commit 9e13b21
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp
@@ -2651,6 +2651,20 @@ bool nsPIDOMWindowInner::IsCurrentInnerWindow() const {
   return outer && outer->GetCurrentInnerWindow() == this;
 }
 
+bool nsPIDOMWindowInner::IsFullyActive() const {
+  WindowContext* currentContext = GetWindowContext();
+  if (!currentContext) {
+    return false;
+  }
+  do {
+    if (currentContext->IsDiscarded() || currentContext->IsCached()) {
+      return false;
+    }
+  } while ((currentContext = currentContext->GetParentWindowContext()));
+
+  return true;
+}
+
 void nsPIDOMWindowInner::SetAudioCapture(bool aCapture) {
   RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
   if (service) {

diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h
@@ -141,6 +141,11 @@ class nsPIDOMWindowInner : public mozIDOMWindow {
   // creates new inner windows for the document it is called on.
   inline bool HasActiveDocument();
 
+  // Return true if this object is the currently-active inner window for its
+  // BrowsingContext and any container document is also fully active.
+  // For https://html.spec.whatwg.org/multipage/browsers.html#fully-active
+  bool IsFullyActive() const;
+
   // Returns true if this window is the same as mTopInnerWindow
   inline bool IsTopInnerWindow() const;
 

diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
@@ -2282,21 +2282,6 @@ nsresult MediaManager::GenerateUUID(nsAString& aResult) {
   return NS_OK;
 }
 
-static bool IsFullyActive(nsPIDOMWindowInner* aWindow) {
-  dom::WindowContext* currentContext;
-  if (!aWindow || !(currentContext = aWindow->GetWindowContext())) {
-    return false;
-  }
-  for (; currentContext;
-       currentContext = currentContext->GetParentWindowContext()) {
-    if (currentContext->IsDiscarded() || currentContext->IsCached()) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
 enum class GetUserMediaSecurityState {
   Other = 0,
   HTTPS = 1,
@@ -2363,7 +2348,7 @@ RefPtr<MediaManager::StreamPromise> MediaManager::GetUserMedia(
         __func__);
   }
 
-  if (!IsFullyActive(aWindow)) {
+  if (!aWindow->IsFullyActive()) {
     return StreamPromise::CreateAndReject(
         MakeRefPtr<MediaMgrError>(MediaMgrError::Name::InvalidStateError),
         __func__);