summaryrefslogtreecommitdiffstats
path: root/dom/media/eme
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-04-22 02:32:20 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-26 10:18:28 +0200
commitb738ccc61b05e4848c0e8d0400a8aee770f591a2 (patch)
tree9d582273d9295a610f8e9d86f1ff20282c570fd0 /dom/media/eme
parent1c3a9a40e5450c2b39f0cea1ffa9143b72931fe9 (diff)
downloadUXP-b738ccc61b05e4848c0e8d0400a8aee770f591a2.tar
UXP-b738ccc61b05e4848c0e8d0400a8aee770f591a2.tar.gz
UXP-b738ccc61b05e4848c0e8d0400a8aee770f591a2.tar.lz
UXP-b738ccc61b05e4848c0e8d0400a8aee770f591a2.tar.xz
UXP-b738ccc61b05e4848c0e8d0400a8aee770f591a2.zip
Issue #80 - De-unify dom/media part 1 (updated reland)
This de-unifies up to and including dom/media/platforms with the exception of dom/media/platforms/wmf, because that one throws weird errors in the Win SDK which don't have a clear cause (yet)
Diffstat (limited to 'dom/media/eme')
-rw-r--r--dom/media/eme/MediaKeySystemAccess.cpp2
-rw-r--r--dom/media/eme/mediadrm/moz.build2
-rw-r--r--dom/media/eme/moz.build2
3 files changed, 4 insertions, 2 deletions
diff --git a/dom/media/eme/MediaKeySystemAccess.cpp b/dom/media/eme/MediaKeySystemAccess.cpp
index 4a5a7a30c..e4e86f4c5 100644
--- a/dom/media/eme/MediaKeySystemAccess.cpp
+++ b/dom/media/eme/MediaKeySystemAccess.cpp
@@ -36,9 +36,11 @@
#include "mozilla/ClearOnShutdown.h"
#include "nsUnicharUtils.h"
#include "mozilla/dom/MediaSource.h"
+#include "DecoderTraits.h"
#ifdef MOZ_WIDGET_ANDROID
#include "FennecJNIWrappers.h"
#endif
+
namespace mozilla {
namespace dom {
diff --git a/dom/media/eme/mediadrm/moz.build b/dom/media/eme/mediadrm/moz.build
index c01f7a52e..83479d670 100644
--- a/dom/media/eme/mediadrm/moz.build
+++ b/dom/media/eme/mediadrm/moz.build
@@ -10,7 +10,7 @@ EXPORTS.mozilla += [
'MediaDrmProxySupport.h',
]
-UNIFIED_SOURCES += [
+SOURCES += [
'MediaDrmCDMCallbackProxy.cpp',
'MediaDrmCDMProxy.cpp',
'MediaDrmProxySupport.cpp',
diff --git a/dom/media/eme/moz.build b/dom/media/eme/moz.build
index 47e622ae3..b55ae3df5 100644
--- a/dom/media/eme/moz.build
+++ b/dom/media/eme/moz.build
@@ -23,7 +23,7 @@ EXPORTS.mozilla += [
'EMEUtils.h',
]
-UNIFIED_SOURCES += [
+SOURCES += [
'CDMCaps.cpp',
'DetailedPromise.cpp',
'EMEUtils.cpp',