Bug 1733902 - part2 : use the new method to check if we should delay media from starting playback. r=emilio

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

dom/audiochannel/AudioChannelService.cpp

@@ -267,8 +267,8 @@ AudioPlaybackConfig AudioChannelService::GetMediaConfig(
     }
 
     config.mMuted = config.mMuted || window->GetAudioMuted();
-    if (window->GetMediaSuspend() != nsISuspendedTypes::NONE_SUSPENDED) {
-      config.mSuspend = window->GetMediaSuspend();
+    if (window->ShouldDelayMediaFromStart()) {
+      config.mSuspend = nsISuspendedTypes::SUSPENDED_BLOCK;
     }
 
     nsCOMPtr<nsPIDOMWindowOuter> win =
@@ -599,8 +599,7 @@ void AudioChannelService::AudioChannelWindow::MaybeNotifyMediaBlockStart(
     return;
   }
 
-  if (window->GetMediaSuspend() != nsISuspendedTypes::SUSPENDED_BLOCK ||
-      !doc->Hidden()) {
+  if (!window->ShouldDelayMediaFromStart() || !doc->Hidden()) {
     return;
   }
 

dom/base/nsGlobalWindowOuter.cpp

@@ -3055,15 +3055,6 @@ bool nsPIDOMWindowOuter::ShouldDelayMediaFromStart() const {
   return bc && bc->Top()->GetShouldDelayMediaFromStart();
 }
 
-SuspendTypes nsPIDOMWindowOuter::GetMediaSuspend() const {
-  // TODO : replace this by `ShouldDelayMediaFromStart` in following patch.
-  BrowsingContext* bc = GetBrowsingContext();
-  if (bc && bc->Top()->GetShouldDelayMediaFromStart()) {
-    return nsISuspendedTypes::SUSPENDED_BLOCK;
-  }
-  return nsISuspendedTypes::NONE_SUSPENDED;
-}
-
 void nsPIDOMWindowOuter::NotifyResumingDelayedMedia() {
   RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
   if (service) {

dom/base/nsPIDOMWindow.h

@@ -780,8 +780,6 @@ class nsPIDOMWindowOuter : public mozIDOMWindowProxy {
   bool IsBackground() { return mIsBackground; }
 
   // Audio API
-  SuspendTypes GetMediaSuspend() const;
-
   bool GetAudioMuted() const;
 
   // No longer to delay media from starting for this window.

dom/media/MediaPlaybackDelayPolicy.cpp

@@ -152,10 +152,7 @@ bool MediaPlaybackDelayPolicy::ShouldDelayPlayback(
   const Document* doc = aElement->OwnerDoc();
   nsPIDOMWindowInner* inner = nsPIDOMWindowInner::From(doc->GetInnerWindow());
   nsPIDOMWindowOuter* outer = nsPIDOMWindowOuter::GetFromCurrentInner(inner);
-  if (!outer) {
-    return false;
-  }
-  return outer->GetMediaSuspend() == nsISuspendedTypes::SUSPENDED_BLOCK;
+  return outer && outer->ShouldDelayMediaFromStart();
 }
 
 RefPtr<ResumeDelayedPlaybackAgent>