Changeset 291267 in webkit

Timestamp:

Mar 15, 2022 12:19:08 AM (4 months ago)

Author:

youenn@apple.com

Message:

AudioContext stops playing when minimizing or moving the macOS Safari window to the background.
​https://bugs.webkit.org/show_bug.cgi?id=231105
<rdar://problem/83889697>

Reviewed by Eric Carlson.

Source/WebCore:

AudioContext was stopped when minimizing windows if not playing audio as a way to reduce CPU usage.
But this is visible to users (if AudioContext produces audio through a track) or to web pages (use of audio worklet or script processor node).
Remove that code.
Small refactoring to remove isOfflineContext checks that can only be false in AudioContext.

Covered by existing tests.

• Modules/webaudio/AudioContext.cpp:
• Modules/webaudio/AudioContext.h:

LayoutTests:

Use internals API to be working on iOS as well (this does not trigger enterBackground code path).

• webaudio/silent-audio-interrupted-in-background-expected.txt:
• webaudio/silent-audio-interrupted-in-background.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webaudio/silent-audio-interrupted-in-background-expected.txt (modified) (2 diffs)
• LayoutTests/webaudio/silent-audio-interrupted-in-background.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webaudio/AudioContext.cpp (modified) (6 diffs)
• Source/WebCore/Modules/webaudio/AudioContext.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-03-15  Youenn Fablet  <youenn@apple.com>
+
+        AudioContext stops playing when minimizing or moving the macOS Safari window to the background.
+        https://bugs.webkit.org/show_bug.cgi?id=231105
+        <rdar://problem/83889697>
+
+        Reviewed by Eric Carlson.
+
+        Use internals API to be working on iOS as well (this does not trigger enterBackground code path).
+
+        * webaudio/silent-audio-interrupted-in-background-expected.txt:
+        * webaudio/silent-audio-interrupted-in-background.html:
+
 2022-03-14  Lauro Moura  <lmoura@igalia.com>
 

trunk/LayoutTests/webaudio/silent-audio-interrupted-in-background-expected.txt

@@ -1 @@
-Tests that silent WebAudio rendering gets interrupted in hidden pages.
+Tests silent WebAudio rendering in hidden pages.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -6 +6 @@
 PASS context.state became 'running'
 * Setting page visibility to hidden
-PASS context.state became 'interrupted'
+PASS document.hidden is true
+PASS context.state is 'running'
 * Setting page visibility to visible
-PASS context.state became 'running'
+PASS document.hidden is false
+PASS context.state is 'running'
 PASS successfullyParsed is true
 

trunk/LayoutTests/webaudio/silent-audio-interrupted-in-background.html

@@ -4 +4 @@
 <script src="../resources/js-test-pre.js"></script>
 <script>
-description("Tests that silent WebAudio rendering gets interrupted in hidden pages.");
+description("Tests silent WebAudio rendering in hidden pages.");
 jsTestIsAsync = true;
 
-document.onvisibilitychange = function() {
-    if (document.hidden) {
-        shouldBecomeEqual("context.state", "'interrupted'", showPage);
-    } else {
-        shouldBecomeEqual("context.state", "'running'", finishJSTest);
+let counter = 0;
+document.onvisibilitychange = async function() {
+    if (!counter) {
+         counter = 1;
+         shouldBeTrue("document.hidden");
+         shouldBe("context.state", "'running'");
+         showPage();
+         return;
     }
+    shouldBeFalse("document.hidden");
+    shouldBe("context.state", "'running'");
+    finishJSTest();
 }
 
@@ -18 +24 @@
 {
     debug("* Setting page visibility to visible");
-    if (window.testRunner)
-        testRunner.setPageVisibility("visible");
+    if (window.internals)
+        internals.setPageVisibility(true);
 }
 
@@ -25 +31 @@
 {
     debug("* Setting page visibility to hidden");
-    if (window.testRunner)
-        testRunner.setPageVisibility("hidden");
+    if (window.internals)
+        internals.setPageVisibility(false);
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-15  Youenn Fablet  <youenn@apple.com>
+
+        AudioContext stops playing when minimizing or moving the macOS Safari window to the background.
+        https://bugs.webkit.org/show_bug.cgi?id=231105
+        <rdar://problem/83889697>
+
+        Reviewed by Eric Carlson.
+
+        AudioContext was stopped when minimizing windows if not playing audio as a way to reduce CPU usage.
+        But this is visible to users (if AudioContext produces audio through a track) or to web pages (use of audio worklet or script processor node).
+        Remove that code.
+        Small refactoring to remove isOfflineContext checks that can only be false in AudioContext.
+
+        Covered by existing tests.
+
+        * Modules/webaudio/AudioContext.cpp:
+        * Modules/webaudio/AudioContext.h:
+
 2022-03-14  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp

@@ -123 +123 @@
 
     document.addAudioProducer(*this);
-    document.registerForVisibilityStateChangedCallbacks(*this);
 
     // Unlike OfflineAudioContext, AudioContext does not require calling resume() to start rendering.
@@ -149 +148 @@
 AudioContext::~AudioContext()
 {
-    if (!isOfflineContext() && scriptExecutionContext()) {
-        document()->removeAudioProducer(*this);
-        document()->unregisterForVisibilityStateChangedCallbacks(*this);
-    }
+    if (auto* document = this->document())
+        document->removeAudioProducer(*this);
 }
 
@@ -194 +191 @@
 void AudioContext::close(DOMPromiseDeferred<void>&& promise)
 {
-    if (isOfflineContext() || isStopped()) {
+    if (isStopped()) {
         promise.reject(InvalidStateError);
         return;
@@ -217 +214 @@
 void AudioContext::suspendRendering(DOMPromiseDeferred<void>&& promise)
 {
-    if (isOfflineContext()) {
-        promise.reject(Exception { InvalidStateError, "Cannot call suspend() on an OfflineAudioContext"_s });
-        return;
-    }
-
     if (isStopped() || state() == State::Closed) {
         promise.reject(Exception { InvalidStateError, "Context is closed"_s });
@@ -248 +240 @@
 void AudioContext::resumeRendering(DOMPromiseDeferred<void>&& promise)
 {
-    if (isOfflineContext()) {
-        promise.reject(Exception { InvalidStateError, "Cannot call resume() on an OfflineAudioContext"_s });
-        return;
-    }
-
     if (isStopped() || state() == State::Closed) {
         promise.reject(Exception { InvalidStateError, "Context is closed"_s });
@@ -417 +404 @@
 }
 
-void AudioContext::visibilityStateChanged()
-{
-    // Do not suspend if audio is audible.
-    if (!document() || mediaState() == MediaProducerMediaState::IsPlayingAudio || isStopped())
-        return;
-
-    if (document()->hidden()) {
-        if (state() == State::Running) {
-            ALWAYS_LOG(LOGIDENTIFIER, "Suspending playback after going to the background");
-            m_mediaSession->beginInterruption(PlatformMediaSession::EnteringBackground);
-        }
-    } else {
-        if (state() == State::Interrupted) {
-            ALWAYS_LOG(LOGIDENTIFIER, "Resuming playback after entering foreground");
-            m_mediaSession->endInterruption(PlatformMediaSession::MayResumePlaying);
-        }
-    }
-}
-
 void AudioContext::suspend(ReasonForSuspension)
 {

trunk/Source/WebCore/Modules/webaudio/AudioContext.h

@@ -31 +31 @@
 #include "MediaProducer.h"
 #include "PlatformMediaSession.h"
-#include "VisibilityChangeClient.h"
 #include <wtf/UniqueRef.h>
 
@@ -49 +48 @@
     , public MediaProducer
     , public MediaCanStartListener
-    , private PlatformMediaSessionClient
-    , private VisibilityChangeClient {
+    , private PlatformMediaSessionClient {
     WTF_MAKE_ISO_ALLOCATED(AudioContext);
 public:
@@ -137 +135 @@
     void mediaCanStart(Document&) final;
 
-    // VisibilityChangeClient
-    void visibilityStateChanged() final;
-
     // ActiveDOMObject
     const char* activeDOMObjectName() const final;