diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-04-22 02:32:20 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 10:18:28 +0200 |
| commit | b738ccc61b05e4848c0e8d0400a8aee770f591a2 (patch) | |
| tree | 9d582273d9295a610f8e9d86f1ff20282c570fd0 /dom/media/gmp | |
| parent | 1c3a9a40e5450c2b39f0cea1ffa9143b72931fe9 (diff) | |
| download | UXP-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/gmp')
| -rw-r--r-- | dom/media/gmp/GMPDecryptorParent.cpp | 2 | ||||
| -rw-r--r-- | dom/media/gmp/GMPUtils.cpp | 2 | ||||
| -rw-r--r-- | dom/media/gmp/moz.build | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/dom/media/gmp/GMPDecryptorParent.cpp b/dom/media/gmp/GMPDecryptorParent.cpp index 4f5402160..56474e973 100644 --- a/dom/media/gmp/GMPDecryptorParent.cpp +++ b/dom/media/gmp/GMPDecryptorParent.cpp @@ -4,7 +4,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "GMPDecryptorParent.h" + #include "GMPContentParent.h" +#include "GMPUtils.h" #include "MediaData.h" #include "mozilla/Unused.h" diff --git a/dom/media/gmp/GMPUtils.cpp b/dom/media/gmp/GMPUtils.cpp index d27523760..6c2147ae2 100644 --- a/dom/media/gmp/GMPUtils.cpp +++ b/dom/media/gmp/GMPUtils.cpp @@ -10,8 +10,10 @@ #include "nsCOMPtr.h" #include "nsLiteralString.h" #include "nsCRTGlue.h" +#include "mozIGeckoMediaPluginService.h" #include "mozilla/Base64.h" #include "nsISimpleEnumerator.h" +#include "prio.h" namespace mozilla { diff --git a/dom/media/gmp/moz.build b/dom/media/gmp/moz.build index 79de6e1d9..8595ee0de 100644 --- a/dom/media/gmp/moz.build +++ b/dom/media/gmp/moz.build @@ -87,7 +87,7 @@ if CONFIG['OS_TARGET'] == 'Android': 'rlz', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'GMPAudioDecoderChild.cpp', 'GMPAudioDecoderParent.cpp', 'GMPAudioHost.cpp', @@ -123,7 +123,7 @@ UNIFIED_SOURCES += [ ] if CONFIG['MOZ_EME']: - UNIFIED_SOURCES += [ + SOURCES += [ 'GMPCDMCallbackProxy.cpp', 'GMPCDMProxy.cpp', ] |