diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2017-12-13 00:26:07 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 10:13:29 +0100 |
| commit | 55d03738f9f79e30bab6294b023176d1a65ab5c3 (patch) | |
| tree | 7642bab700a61a4d0880b1f0773cbd8a9760217a /dom/base/Navigator.h | |
| parent | 011dac290a9ea52539754aa64958df204425eb76 (diff) | |
| download | UXP-55d03738f9f79e30bab6294b023176d1a65ab5c3.tar UXP-55d03738f9f79e30bab6294b023176d1a65ab5c3.tar.gz UXP-55d03738f9f79e30bab6294b023176d1a65ab5c3.tar.lz UXP-55d03738f9f79e30bab6294b023176d1a65ab5c3.tar.xz UXP-55d03738f9f79e30bab6294b023176d1a65ab5c3.zip | |
Don't include MediaKeySystemAccess without EME.
This also removes checks for EME content in documents.
This removes practical use of EME by no longer having a keying system. (no-op)
tag #26
Diffstat (limited to 'dom/base/Navigator.h')
| -rw-r--r-- | dom/base/Navigator.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h index 4b4ae6759..d47a80bc1 100644 --- a/dom/base/Navigator.h +++ b/dom/base/Navigator.h @@ -18,7 +18,9 @@ #include "nsString.h" #include "nsTArray.h" #include "nsWeakPtr.h" +#ifdef MOZ_EME #include "mozilla/dom/MediaKeySystemAccessManager.h" +#endif class nsPluginArray; class nsMimeTypeArray; @@ -258,12 +260,14 @@ public: // any, else null. static already_AddRefed<nsPIDOMWindowInner> GetWindowFromGlobal(JSObject* aGlobal); +#ifdef MOZ_EME already_AddRefed<Promise> RequestMediaKeySystemAccess(const nsAString& aKeySystem, const Sequence<MediaKeySystemConfiguration>& aConfig, ErrorResult& aRv); private: RefPtr<MediaKeySystemAccessManager> mMediaKeySystemAccessManager; +#endif public: void NotifyVRDisplaysUpdated(); |