Enable AudioSession Web API by default, but only a reduced subset

youennf · youennf · commit c39358705b79 · 2023-01-19T01:38:42.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=250764 rdar://104381410 Reviewed by Eric Carlson. Enable by default navigator.audioSession and navigator.audioSession.type but not the state/event API. For that purpose, introduce a second flag for the extended API. Update LayoutTests/media/audioSession/audioSessionType.html to cover the new flag. Remove the flaky test expectations for two related audioSession tests since they are no longer flaky in bots. * LayoutTests/media/audioSession/audioSessionType.html: * LayoutTests/platform/mac-wk2/TestExpectations: * Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml: * Source/WebCore/Modules/audiosession/DOMAudioSession.idl: Canonical link: https://commits.webkit.org/259074@main
diff --git a/LayoutTests/media/audioSession/audioSessionType.html b/LayoutTests/media/audioSession/audioSessionType.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!doctype html><!-- webkit-test-runner [ DOMAudioSessionFullEnabled=false ] -->
 <html>
     <head>
         <meta charset="utf-8">
@@ -26,7 +26,9 @@
 
 promise_test(async (test) => {
     assert_equals(navigator.audioSession.type, "auto");
-    
+    assert_equals(AudioSession.prototype.state, undefined);
+    assert_equals(AudioSession.prototype.onstatechange, undefined);
+
     if (!window.internals)
         return;
 
diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
@@ -1808,7 +1808,3 @@ webkit.org/b/250784 media/audio-session-category.html [ Pass Failure ]
 [ BigSur+ ] imported/w3c/web-platform-tests/service-workers/cache-storage/cross-partition.https.tentative.html [ Pass Failure Crash ]
 
 webkit.org/b/248997 [ BigSur+ ] http/tests/navigation/fragment-navigation-policy-ignore.html [ Pass Failure ]
-
-webkit.org/b/249407 [ BigSur+ ] media/audioSession/getUserMedia.html [ Failure ]
-
-webkit.org/b/249486 [ BigSur+ ] media/audioSession/audioSessionType.html [ Failure ]
diff --git a/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml b/Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
@@ -1507,8 +1507,22 @@ DNSPrefetchingEnabled:
 DOMAudioSessionEnabled:
   type: bool
   status: testable
-  humanReadableName: "AudioSession"
-  humanReadableDescription: "Enable AudioSession"
+  humanReadableName: "AudioSession API"
+  humanReadableDescription: "Enable AudioSession API"
+  condition: ENABLE(DOM_AUDIO_SESSION)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: true
+    WebCore:
+      default: true
+
+DOMAudioSessionFullEnabled:
+  type: bool
+  status: testable
+  humanReadableName: "AudioSession full API"
+  humanReadableDescription: "Enable AudioSession full API"
   condition: ENABLE(DOM_AUDIO_SESSION)
   defaultValue:
     WebKitLegacy:
diff --git a/Source/WebCore/Modules/audiosession/DOMAudioSession.idl b/Source/WebCore/Modules/audiosession/DOMAudioSession.idl
@@ -47,6 +47,6 @@ enum DOMAudioSessionType {
 ] interface DOMAudioSession : EventTarget {
     attribute DOMAudioSessionType type;
 
-    readonly attribute DOMAudioSessionState state;
-    attribute EventHandler onstatechange;
+    [EnabledBySetting=DOMAudioSessionFullEnabled] readonly attribute DOMAudioSessionState state;
+    [EnabledBySetting=DOMAudioSessionFullEnabled] attribute EventHandler onstatechange;
 };
