From 3b999ebf25063f9af7903acb3cc4fa7655ce7ec2 Mon Sep 17 00:00:00 2001
From: Edwin Flores <eflores@mozilla.com>
Date: Mon, 23 Mar 2015 16:44:20 +1300
Subject: [PATCH] Bug 1134434 - Fix bustage on a CLOSED TREE - r=bustage

---
 dom/html/HTMLMediaElement.cpp               | 2 ++
 dom/media/mediasource/MediaSourceReader.cpp | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
index e04e75f8068..e91b891132f 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -3092,7 +3092,9 @@ void HTMLMediaElement::MetadataLoaded(const MediaInfo* aInfo,
       return;
     }
 
+#ifdef MOZ_EME
     DispatchEncrypted(aInfo->mCrypto.mInitData, aInfo->mCrypto.mType);
+#endif
   }
 
   // Expose the tracks to JS directly.
diff --git a/dom/media/mediasource/MediaSourceReader.cpp b/dom/media/mediasource/MediaSourceReader.cpp
index ce21ef10eb3..a09867e4c31 100644
--- a/dom/media/mediasource/MediaSourceReader.cpp
+++ b/dom/media/mediasource/MediaSourceReader.cpp
@@ -96,6 +96,7 @@ MediaSourceReader::IsWaitingMediaResources()
 bool
 MediaSourceReader::IsWaitingOnCDMResource()
 {
+#ifdef MOZ_EME
   ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
   MOZ_ASSERT(!IsWaitingMediaResources());
 
@@ -106,6 +107,9 @@ MediaSourceReader::IsWaitingOnCDMResource()
   }
 
   return mInfo.IsEncrypted() && !mCDMProxy;
+#else
+  return false;
+#endif
 }
 
 size_t