Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 2 deletions

diff --git a/dom/media/ipc/PMFCDM.ipdl b/dom/media/ipc/PMFCDM.ipdl
index e86b94c217..793cfa3808 100644
--- a/dom/media/ipc/PMFCDM.ipdl
+++ b/dom/media/ipc/PMFCDM.ipdl
@@ -12,6 +12,7 @@ using mozilla::CryptoScheme from "MediaData.h";
 using mozilla::dom::MediaKeyMessageType from "mozilla/dom/MediaKeyMessageEventBinding.h";
 using mozilla::dom::MediaKeyStatus from "mozilla/dom/MediaKeyStatusMapBinding.h";
 using mozilla::dom::HDCPVersion from "mozilla/dom/MediaKeysBinding.h";
+using mozilla::KeySystemConfigRequest from "mozilla/KeySystemConfig.h";
 
 namespace mozilla {
 
@@ -57,7 +58,8 @@ struct MFCDMCapabilitiesIPDL {
   CryptoScheme[] encryptionSchemes;
   Requirement distinctiveID;
   Requirement persistentState;
-  bool isHDCP22Compatible;
+  bool? isHDCP22Compatible;
+  bool isHardwareDecryption;
 };
 
 union MFCDMCapabilitiesResult {
@@ -95,12 +97,17 @@ union MFCDMSessionResult {
   nsresult;
 };
 
+struct MFCDMCapabilitiesRequest {
+  nsString keySystem;
+  bool isHardwareDecryption;
+};
+
 [ManualDealloc]
 async protocol PMFCDM
 {
   manager PRemoteDecoderManager;
 parent:
-  async GetCapabilities(bool isHwSecured) returns (MFCDMCapabilitiesResult result);
+  async GetCapabilities(MFCDMCapabilitiesRequest request) returns (MFCDMCapabilitiesResult result);
   async Init(MFCDMInitParamsIPDL params) returns (MFCDMInitResult result);
   async CreateSessionAndGenerateRequest(MFCDMCreateSessionParamsIPDL type)
       returns (MFCDMSessionResult result);