From 75404aff0dcc9f50bb6c5d642c960856e32dc73f Mon Sep 17 00:00:00 2001
From: alwu <alwu@mozilla.com>
Date: Mon, 10 Jun 2024 23:20:43 +0000
Subject: [PATCH] Bug 1898344 - part3 : remove the pref
 'media.media-capabilities.enable'.
 r=media-playback-reviewers,webidl,saschanaz,padenot

Media Capabilities has been shipped as a standard feature long enough,
it's no need to guard it by the preference anymore.

Differential Revision: https://phabricator.services.mozilla.com/D212322
---
 dom/media/mediacapabilities/MediaCapabilities.cpp | 4 ----
 dom/media/mediacapabilities/MediaCapabilities.h   | 2 --
 dom/webidl/MediaCapabilities.webidl               | 5 ++---
 dom/webidl/Navigator.webidl                       | 2 +-
 dom/webidl/WorkerNavigator.webidl                 | 2 +-
 modules/libpref/init/StaticPrefList.yaml          | 5 -----
 6 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/dom/media/mediacapabilities/MediaCapabilities.cpp b/dom/media/mediacapabilities/MediaCapabilities.cpp
index fd79d90d4a0a..c5e8f1beb0b7 100644
--- a/dom/media/mediacapabilities/MediaCapabilities.cpp
+++ b/dom/media/mediacapabilities/MediaCapabilities.cpp
@@ -649,10 +649,6 @@ already_AddRefed<layers::KnowsCompositor> MediaCapabilities::GetCompositor() {
   return knows->GetForMedia().forget();
 }
 
-bool MediaCapabilities::Enabled(JSContext* aCx, JSObject* aGlobal) {
-  return StaticPrefs::media_media_capabilities_enabled();
-}
-
 JSObject* MediaCapabilities::WrapObject(JSContext* aCx,
                                         JS::Handle<JSObject*> aGivenProto) {
   return MediaCapabilities_Binding::Wrap(aCx, this, aGivenProto);
diff --git a/dom/media/mediacapabilities/MediaCapabilities.h b/dom/media/mediacapabilities/MediaCapabilities.h
index 3532efd34cc9..22dc6a2768cc 100644
--- a/dom/media/mediacapabilities/MediaCapabilities.h
+++ b/dom/media/mediacapabilities/MediaCapabilities.h
@@ -60,8 +60,6 @@ class MediaCapabilities final : public nsISupports, public nsWrapperCache {
   JSObject* WrapObject(JSContext* aCx,
                        JS::Handle<JSObject*> aGivenProto) override;
 
-  static bool Enabled(JSContext* aCx, JSObject* aGlobal);
-
  private:
   virtual ~MediaCapabilities() = default;
   Maybe<MediaContainerType> CheckVideoConfiguration(
diff --git a/dom/webidl/MediaCapabilities.webidl b/dom/webidl/MediaCapabilities.webidl
index 9d23a89e9594..b08caf25c92b 100644
--- a/dom/webidl/MediaCapabilities.webidl
+++ b/dom/webidl/MediaCapabilities.webidl
@@ -88,15 +88,14 @@ dictionary AudioConfiguration {
   unsigned long samplerate;
 };
 
-[Exposed=(Window, Worker), Func="mozilla::dom::MediaCapabilities::Enabled",
- HeaderFile="mozilla/dom/MediaCapabilities.h"]
+[Exposed=(Window, Worker), HeaderFile="mozilla/dom/MediaCapabilities.h"]
 interface MediaCapabilitiesInfo {
   readonly attribute boolean supported;
   readonly attribute boolean smooth;
   readonly attribute boolean powerEfficient;
 };
 
-[Exposed=(Window, Worker), Func="mozilla::dom::MediaCapabilities::Enabled"]
+[Exposed=(Window, Worker)]
 interface MediaCapabilities {
   [NewObject]
   Promise<MediaCapabilitiesInfo> decodingInfo(MediaDecodingConfiguration configuration);
diff --git a/dom/webidl/Navigator.webidl b/dom/webidl/Navigator.webidl
index 8638e94a17b0..62375467a2b8 100644
--- a/dom/webidl/Navigator.webidl
+++ b/dom/webidl/Navigator.webidl
@@ -161,7 +161,7 @@ partial interface Navigator {
 // https://wicg.github.io/media-capabilities/#idl-index
 [Exposed=Window]
 partial interface Navigator {
-  [SameObject, Func="mozilla::dom::MediaCapabilities::Enabled"]
+  [SameObject]
   readonly attribute MediaCapabilities mediaCapabilities;
 };
 
diff --git a/dom/webidl/WorkerNavigator.webidl b/dom/webidl/WorkerNavigator.webidl
index 0134df5d5b23..34d01935d979 100644
--- a/dom/webidl/WorkerNavigator.webidl
+++ b/dom/webidl/WorkerNavigator.webidl
@@ -25,7 +25,7 @@ partial interface WorkerNavigator {
 // https://wicg.github.io/media-capabilities/#idl-index
 [Exposed=Worker]
 partial interface WorkerNavigator {
-  [SameObject, Func="mozilla::dom::MediaCapabilities::Enabled"]
+  [SameObject]
   readonly attribute MediaCapabilities mediaCapabilities;
 };
 
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index a9f4db31ff3d..db204c731c47 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -10957,11 +10957,6 @@
   value: false
   mirror: always
 
-- name: media.media-capabilities.enabled
-  type: RelaxedAtomicBool
-  value: true
-  mirror: always
-
 - name: media.media-capabilities.screen.enabled
   type: RelaxedAtomicBool
   value: false