diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-04-22 13:17:28 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-04-22 13:17:28 +0000 |
| commit | 6f37b2107aaa44a02a3c9abb015d2a65cb9bebee (patch) | |
| tree | 0f8b70200fa1800ae93a8047c1218b3645c2eb53 /dom/media/gmp | |
| parent | 2bfcaa29ac39c995af0bd5b9efcddbfdeb84be76 (diff) | |
| download | UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.tar UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.tar.gz UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.tar.lz UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.tar.xz UXP-6f37b2107aaa44a02a3c9abb015d2a65cb9bebee.zip | |
Revert "Issue #80 - De-unify dom/media part 1"
This reverts commit b5b62d841c733dcb62112f3158f1488e670671d6.
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, 2 insertions, 6 deletions
diff --git a/dom/media/gmp/GMPDecryptorParent.cpp b/dom/media/gmp/GMPDecryptorParent.cpp index 56474e973..4f5402160 100644 --- a/dom/media/gmp/GMPDecryptorParent.cpp +++ b/dom/media/gmp/GMPDecryptorParent.cpp @@ -4,9 +4,7 @@ * 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 6c2147ae2..d27523760 100644 --- a/dom/media/gmp/GMPUtils.cpp +++ b/dom/media/gmp/GMPUtils.cpp @@ -10,10 +10,8 @@ #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 8595ee0de..79de6e1d9 100644 --- a/dom/media/gmp/moz.build +++ b/dom/media/gmp/moz.build @@ -87,7 +87,7 @@ if CONFIG['OS_TARGET'] == 'Android': 'rlz', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'GMPAudioDecoderChild.cpp', 'GMPAudioDecoderParent.cpp', 'GMPAudioHost.cpp', @@ -123,7 +123,7 @@ SOURCES += [ ] if CONFIG['MOZ_EME']: - SOURCES += [ + UNIFIED_SOURCES += [ 'GMPCDMCallbackProxy.cpp', 'GMPCDMProxy.cpp', ] |