Bug 1646601 throw InvalidStateError on (Offline)AudioContext construc…

…tion when not fully active r=padenot https://github.com/WebAudio/web-audio-api/pull/1425/files#diff-eacf331f0ffc35d4b482f1d15a887d3bR2245 Differential Revision: https://phabricator.services.mozilla.com/D84302
dothq · Sep 15, 2020 · 8b05bea · 8b05bea
1 parent 9e13b21
commit 8b05bea
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp
@@ -251,6 +251,14 @@ JSObject* AudioContext::WrapObject(JSContext* aCx,
   }
 }
 
+static bool CheckFullyActive(nsPIDOMWindowInner* aWindow, ErrorResult& aRv) {
+  if (!aWindow->IsFullyActive()) {
+    aRv.ThrowInvalidStateError("The document is not fully active.");
+    return false;
+  }
+  return true;
+}
+
 /* static */
 already_AddRefed<AudioContext> AudioContext::Constructor(
     const GlobalObject& aGlobal, const AudioContextOptions& aOptions,
@@ -261,6 +269,14 @@ already_AddRefed<AudioContext> AudioContext::Constructor(
     aRv.Throw(NS_ERROR_FAILURE);
     return nullptr;
   }
+  /**
+   * If the current settings object’s responsible document is NOT fully
+   * active, throw an InvalidStateError and abort these steps.
+   */
+  if (!CheckFullyActive(window, aRv)) {
+    return nullptr;
+  }
+
   if (aOptions.mSampleRate.WasPassed() &&
       (aOptions.mSampleRate.Value() < WebAudioUtils::MinSampleRate ||
        aOptions.mSampleRate.Value() > WebAudioUtils::MaxSampleRate)) {
@@ -304,6 +320,13 @@ already_AddRefed<AudioContext> AudioContext::Constructor(
     aRv.Throw(NS_ERROR_FAILURE);
     return nullptr;
   }
+  /**
+   * If the current settings object’s responsible document is NOT fully
+   * active, throw an InvalidStateError and abort these steps.
+   */
+  if (!CheckFullyActive(window, aRv)) {
+    return nullptr;
+  }
 
   if (aNumberOfChannels == 0 ||
       aNumberOfChannels > WebAudioUtils::MaxChannelCount) {

diff --git a/dom/media/webaudio/test/test_bug827541.html b/dom/media/webaudio/test/test_bug827541.html
@@ -3,6 +3,7 @@
 <head>
   <title>Tell the cycle collector about the audio contexts owned by nsGlobalWindow</title>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="webaudio.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
@@ -13,9 +14,10 @@
   var frameWin = iframe.contentWindow;
   new frameWin.AudioContext();
   document.body.removeChild(iframe);
-  new frameWin.AudioContext();
+  expectException(() => new frameWin.AudioContext(),
+                  DOMException.INVALID_STATE_ERR);
 
-  ok(true, "This test should not leak");
+  // This test should not leak.
 </script>
 </pre>
 </body>