From 1dbd9799db37d8491a1ddb2d47e89f40fefd9c63 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sat, 24 Feb 2018 11:37:35 +0100
Subject: Fix up leftover merge conflicts.

Tag #26
---
 dom/media/webaudio/AudioContext.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'dom/media')

diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp
index f61226a482..a36eda6214 100644
--- a/dom/media/webaudio/AudioContext.cpp
+++ b/dom/media/webaudio/AudioContext.cpp
@@ -379,10 +379,12 @@ AudioContext::CreateMediaElementSource(HTMLMediaElement& aMediaElement,
     return nullptr;
   }
 
+#ifdef MOZ_EME
   if (aMediaElement.ContainsRestrictedContent()) {
     aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
     return nullptr;
   }
+#endif
 
   if (CheckClosed(aRv)) {
     return nullptr;
-- 
cgit v1.2.3