diff options
| author | win7-7 <win7-7@users.noreply.github.com> | 2020-02-06 17:17:28 +0200 |
|---|---|---|
| committer | win7-7 <win7-7@users.noreply.github.com> | 2020-02-06 17:17:28 +0200 |
| commit | 6376eceaebe8852b3b74bc77bd1cd6d06e5bb049 (patch) | |
| tree | 2ecda9bf32e7a41a324e3dbf5c3c7fbcc1890dd1 /dom/media/gmp/GMPChild.cpp | |
| parent | 074f23467b57595007b1c5ff9906e3f30fdfdf9e (diff) | |
| parent | 04c770c8c84b9251b36d3c58c847b63e9b4fa08d (diff) | |
| download | UXP-6376eceaebe8852b3b74bc77bd1cd6d06e5bb049.tar UXP-6376eceaebe8852b3b74bc77bd1cd6d06e5bb049.tar.gz UXP-6376eceaebe8852b3b74bc77bd1cd6d06e5bb049.tar.lz UXP-6376eceaebe8852b3b74bc77bd1cd6d06e5bb049.tar.xz UXP-6376eceaebe8852b3b74bc77bd1cd6d06e5bb049.zip | |
Merge branch 'master' into optimization-3-pr
Diffstat (limited to 'dom/media/gmp/GMPChild.cpp')
| -rw-r--r-- | dom/media/gmp/GMPChild.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp index 14b06cc72..fa6f2f4c8 100644 --- a/dom/media/gmp/GMPChild.cpp +++ b/dom/media/gmp/GMPChild.cpp @@ -22,7 +22,9 @@ #include "GMPUtils.h" #include "prio.h" #include "base/task.h" +#ifdef MOZ_EME #include "widevine-adapter/WidevineAdapter.h" +#endif using namespace mozilla::ipc; @@ -254,9 +256,13 @@ GMPChild::AnswerStartPlugin(const nsString& aAdapter) return false; } +#ifdef MOZ_EME bool isWidevine = aAdapter.EqualsLiteral("widevine"); GMPAdapter* adapter = (isWidevine) ? new WidevineAdapter() : nullptr; +#else + GMPAdapter* adapter = nullptr; +#endif if (!mGMPLoader->Load(libPath.get(), libPath.Length(), mNodeId.BeginWriting(), |