From f2ec6ef34d9f38faed6b0b2f556390976353fef7 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Wed, 18 Oct 2023 10:59:39 +0200
Subject: Issue #2346 - Remove IsWaitingOnCDMResource stub

---
 dom/media/MediaFormatReader.cpp | 11 +----------
 dom/media/MediaFormatReader.h   |  2 --
 2 files changed, 1 insertion(+), 12 deletions(-)

(limited to 'dom')

diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp
index 2bdd2621ac..17fa29c080 100644
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -583,13 +583,6 @@ MediaFormatReader::InitInternal()
   return NS_OK;
 }
 
-bool
-MediaFormatReader::IsWaitingOnCDMResource() {
-  MOZ_ASSERT(OnTaskQueue());
-  /* EME stub */
-  return false;
-}
-
 RefPtr<MediaDecoderReader::MetadataPromise>
 MediaFormatReader::AsyncReadMetadata()
 {
@@ -625,9 +618,7 @@ MediaFormatReader::OnDemuxerInitDone(nsresult)
   UniquePtr<MetadataTags> tags(MakeUnique<MetadataTags>());
 
   RefPtr<PDMFactory> platform;
-  if (!IsWaitingOnCDMResource()) {
-    platform = new PDMFactory();
-  }
+  platform = new PDMFactory();
 
   // To decode, we need valid video and a place to put it.
   bool videoActive = !!mDemuxer->GetNumberTracks(TrackInfo::kVideoTrack) &&
diff --git a/dom/media/MediaFormatReader.h b/dom/media/MediaFormatReader.h
index 4e084f4158..60ee022264 100644
--- a/dom/media/MediaFormatReader.h
+++ b/dom/media/MediaFormatReader.h
@@ -100,8 +100,6 @@ private:
   bool HasVideo() const { return mVideo.mTrackDemuxer; }
   bool HasAudio() const { return mAudio.mTrackDemuxer; }
 
-  bool IsWaitingOnCDMResource();
-
   bool InitDemuxer();
   // Notify the demuxer that new data has been received.
   // The next queued task calling GetBuffered() is guaranteed to have up to date
-- 
cgit v1.2.3