diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 22:12:27 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 22:12:27 +0100 |
| commit | e10dfb62ff916d49632febb59565f3c52f4970bd (patch) | |
| tree | e3162c57574bcf7f91d262d9a8cd70ece01f9edb /dom/webidl | |
| parent | fd6b1ad6f9768556bb03a0fbdb16587fdfd0a962 (diff) | |
| parent | 27727874636868dc6d61e8117f81cd761c91e2ed (diff) | |
| download | UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.gz UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.lz UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.xz UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.zip | |
Merge branch 'EME-work'
Diffstat (limited to 'dom/webidl')
| -rw-r--r-- | dom/webidl/HTMLMediaElement.webidl | 2 | ||||
| -rw-r--r-- | dom/webidl/Navigator.webidl | 2 | ||||
| -rw-r--r-- | dom/webidl/moz.build | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/dom/webidl/HTMLMediaElement.webidl b/dom/webidl/HTMLMediaElement.webidl index 456579ec1..313686dac 100644 --- a/dom/webidl/HTMLMediaElement.webidl +++ b/dom/webidl/HTMLMediaElement.webidl @@ -153,6 +153,7 @@ partial interface HTMLMediaElement { attribute EventHandler onmozinterruptend; }; +#ifdef MOZ_EME // Encrypted Media Extensions partial interface HTMLMediaElement { [Pref="media.eme.apiVisible"] @@ -168,6 +169,7 @@ partial interface HTMLMediaElement { [Pref="media.eme.apiVisible"] attribute EventHandler onwaitingforkey; }; +#endif // This is just for testing partial interface HTMLMediaElement { diff --git a/dom/webidl/Navigator.webidl b/dom/webidl/Navigator.webidl index 56461e429..5452f3247 100644 --- a/dom/webidl/Navigator.webidl +++ b/dom/webidl/Navigator.webidl @@ -348,12 +348,14 @@ partial interface Navigator { readonly attribute LegacyMozTCPSocket mozTCPSocket; }; +#ifdef MOZ_EME partial interface Navigator { [Pref="media.eme.apiVisible", NewObject] Promise<MediaKeySystemAccess> requestMediaKeySystemAccess(DOMString keySystem, sequence<MediaKeySystemConfiguration> supportedConfigurations); }; +#endif #ifdef NIGHTLY_BUILD partial interface Navigator { diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index f24c366e8..5dc637799 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -9,6 +9,7 @@ GENERATED_WEBIDL_FILES = [ ] PREPROCESSED_WEBIDL_FILES = [ + 'HTMLMediaElement.webidl', 'Navigator.webidl', 'Node.webidl', 'Promise.webidl', @@ -210,7 +211,6 @@ WEBIDL_FILES = [ 'HTMLLIElement.webidl', 'HTMLLinkElement.webidl', 'HTMLMapElement.webidl', - 'HTMLMediaElement.webidl', 'HTMLMenuElement.webidl', 'HTMLMenuItemElement.webidl', 'HTMLMetaElement.webidl', |