From 30d3325148feb564ee8d20e028cf85e707e5ae0c Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Tue, 17 Oct 2023 13:38:57 +0200
Subject: Issue #2346 - Remove stub for setting decryptor ID

---
 dom/media/gmp/GMPDecryptorChild.cpp  | 5 -----
 dom/media/gmp/GMPDecryptorParent.cpp | 7 -------
 dom/media/gmp/GMPDecryptorParent.h   | 2 --
 dom/media/gmp/PGMPDecryptor.ipdl     | 2 --
 4 files changed, 16 deletions(-)

diff --git a/dom/media/gmp/GMPDecryptorChild.cpp b/dom/media/gmp/GMPDecryptorChild.cpp
index 6da3c6c43e..a1b561ab59 100644
--- a/dom/media/gmp/GMPDecryptorChild.cpp
+++ b/dom/media/gmp/GMPDecryptorChild.cpp
@@ -73,11 +73,6 @@ GMPDecryptorChild::Init(GMPDecryptor* aSession)
 {
   MOZ_ASSERT(aSession);
   mSession = aSession;
-  // The ID of this decryptor is the IPDL actor ID. Note it's unique inside
-  // the child process, but not necessarily across all gecko processes. However,
-  // since GMPDecryptors are segregated by node ID/origin, we shouldn't end up
-  // with clashes in the content process.
-  SendSetDecryptorId(Id());
 }
 
 void
diff --git a/dom/media/gmp/GMPDecryptorParent.cpp b/dom/media/gmp/GMPDecryptorParent.cpp
index 410868c33b..c41d5d18f5 100644
--- a/dom/media/gmp/GMPDecryptorParent.cpp
+++ b/dom/media/gmp/GMPDecryptorParent.cpp
@@ -42,13 +42,6 @@ GMPDecryptorParent::~GMPDecryptorParent()
 {
 }
 
-bool
-GMPDecryptorParent::RecvSetDecryptorId(const uint32_t& aId)
-{
- /* EME stub */
-  return true;
-}
-
 nsresult
 GMPDecryptorParent::Init(GMPDecryptorProxyCallback* aCallback,
                          bool aDistinctiveIdentifierRequired,
diff --git a/dom/media/gmp/GMPDecryptorParent.h b/dom/media/gmp/GMPDecryptorParent.h
index 30ff246901..3acf7dbd96 100644
--- a/dom/media/gmp/GMPDecryptorParent.h
+++ b/dom/media/gmp/GMPDecryptorParent.h
@@ -72,8 +72,6 @@ private:
 
   // PGMPDecryptorParent
 
-  bool RecvSetDecryptorId(const uint32_t& aId) override;
-
   bool RecvSetSessionId(const uint32_t& aCreateSessionToken,
                         const nsCString& aSessionId) override;
 
diff --git a/dom/media/gmp/PGMPDecryptor.ipdl b/dom/media/gmp/PGMPDecryptor.ipdl
index 06b9b9cb60..207933e8a6 100644
--- a/dom/media/gmp/PGMPDecryptor.ipdl
+++ b/dom/media/gmp/PGMPDecryptor.ipdl
@@ -53,8 +53,6 @@ child:
 parent:
   async __delete__();
 
-  async SetDecryptorId(uint32_t aId);
-
   async SetSessionId(uint32_t aCreateSessionToken,
                      nsCString aSessionId);
 
-- 
cgit v1.2.3