From 7651430ef0e2f757edaf8c4a9f1d44d6e81f98d0 Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Sun, 27 Sep 2015 18:59:52 +0800
Subject: [PATCH] Bug 1208922. Part 6 - IsWaitingOnCDMResource() is not used by
 MDSM anymore. Remove it from MediaDecoderReader and make it private in
 MediaFormatReader. r=cpearce.

---
 dom/media/MediaDecoderReader.h  | 3 ---
 dom/media/MediaFormatReader.cpp | 4 +++-
 dom/media/MediaFormatReader.h   | 8 ++------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/dom/media/MediaDecoderReader.h b/dom/media/MediaDecoderReader.h
index 709bf46bf5c4..3c64aed383a6 100644
--- a/dom/media/MediaDecoderReader.h
+++ b/dom/media/MediaDecoderReader.h
@@ -97,9 +97,6 @@ public:
 
   // True if this reader is waiting media resource allocation
   virtual bool IsWaitingMediaResources() { return false; }
-  // True if this reader is waiting for a Content Decryption Module to become
-  // available.
-  virtual bool IsWaitingOnCDMResource() { return false; }
   // Release media resources they should be released in dormant state
   // The reader can be made usable again by calling ReadMetadata().
   virtual void ReleaseMediaResources() {};
diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp
index dbc5e1429584..d643d1d918db 100644
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -226,7 +226,9 @@ MediaFormatReader::SetCDMProxy(CDMProxy* aProxy)
 }
 #endif // MOZ_EME
 
-bool MediaFormatReader::IsWaitingOnCDMResource() {
+bool
+MediaFormatReader::IsWaitingOnCDMResource() {
+  MOZ_ASSERT(OnTaskQueue());
 #ifdef MOZ_EME
   return IsEncrypted() && !mCDMProxy;
 #else
diff --git a/dom/media/MediaFormatReader.h b/dom/media/MediaFormatReader.h
index fcfac8a70773..98ed78614c33 100644
--- a/dom/media/MediaFormatReader.h
+++ b/dom/media/MediaFormatReader.h
@@ -88,8 +88,6 @@ public:
   bool IsWaitForDataSupported() override { return true; }
   nsRefPtr<WaitForDataPromise> WaitForData(MediaData::Type aType) override;
 
-  bool IsWaitingOnCDMResource() override;
-
   bool UseBufferingHeuristics() override
   {
     return mTrackDemuxersMayBlock;
@@ -100,6 +98,8 @@ public:
 #endif
 
 private:
+  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
@@ -397,10 +397,6 @@ private:
   {
     return mIsEncrypted;
   }
-  // Accessed from multiple thread, in particular the MediaDecoderStateMachine,
-  // however the value doesn't currently change after reading the metadata.
-  // TODO handle change of encryption half-way. The above assumption will then
-  // become incorrect.
   bool mIsEncrypted;
 
   // Set to true if any of our track buffers may be blocking.