Backed out changeset b0eeee008090 (bug 1242321)

addon-sdk/source/python-lib/cuddlefish/prefs.py

@@ -238,7 +238,8 @@ DEFAULT_TEST_PREFS = {
     'dom.mozApps.debug': True,
     'dom.apps.customization.enabled': True,
     'media.eme.enabled': True,
-    # Don't forcibly kill content processes after a timeout
+    'media.eme.apiVisible': True,
+    # Don't forceably kill content processes after a timeout
     'dom.ipc.tabs.shutdownTimeoutSecs': 0,
     'general.useragent.locale': "en-US",
     'intl.locale.matchOS': "en-US",

addon-sdk/source/test/preferences/test.json

@@ -42,6 +42,7 @@
   "dom.mozApps.debug": true,
   "dom.apps.customization.enabled": true,
   "media.eme.enabled": true,
+  "media.eme.apiVisible": true,
   "dom.ipc.tabs.shutdownTimeoutSecs": 0,
   "general.useragent.locale": "en-US",
   "intl.locale.matchOS": "en-US",

b2g/app/b2g.js

@@ -327,6 +327,7 @@ pref("media.gonk.enabled", true);
 
 //Encrypted media extensions.
 pref("media.eme.enabled", true);
+pref("media.eme.apiVisible", true);
 // The default number of decoded video frames that are enqueued in
 // MediaDecoderReader's mVideoQueue.
 pref("media.video-queue.default-size", 3);

browser/app/profile/firefox.js

@@ -1500,6 +1500,7 @@ pref("ui.key.menuAccessKeyFocuses", true);
 
 // Encrypted media extensions.
 pref("media.eme.enabled", true);
+pref("media.eme.apiVisible", true);
 
 // Decode using Gecko Media Plugins in <video>, if a system decoder is not
 // availble and the preferred GMP is available.

dom/media/test/eme.js

@@ -418,6 +418,7 @@ function SetupEME(test, token, params)
 function SetupEMEPref(callback) {
   var prefs = [
     [ "media.mediasource.enabled", true ],
+    [ "media.eme.apiVisible", true ],
   ];
 
   if (SpecialPowers.Services.appinfo.name == "B2G" ||

dom/webidl/HTMLMediaElement.webidl

@@ -156,12 +156,14 @@ partial interface HTMLMediaElement {
 #ifdef MOZ_EME
 // Encrypted Media Extensions
 partial interface HTMLMediaElement {
+  [Pref="media.eme.apiVisible"]
   readonly attribute MediaKeys? mediaKeys;
 
   // void, not any: https://www.w3.org/Bugs/Public/show_bug.cgi?id=26457
-  [NewObject]
+  [Pref="media.eme.apiVisible", NewObject]
   Promise<void> setMediaKeys(MediaKeys? mediaKeys);
 
+  [Pref="media.eme.apiVisible"]
   attribute EventHandler onencrypted;
 };
 #endif

dom/webidl/MediaEncryptedEvent.webidl

@@ -10,7 +10,7 @@
  * W3C liability, trademark and document use rules apply.
  */
 
-[Constructor(DOMString type, optional MediaKeyNeededEventInit eventInitDict)]
+[Pref="media.eme.apiVisible", Constructor(DOMString type, optional MediaKeyNeededEventInit eventInitDict)]
 interface MediaEncryptedEvent : Event {
   readonly attribute DOMString initDataType;
   [Throws]

dom/webidl/MediaKeyError.webidl

@@ -13,6 +13,7 @@
 // According to the spec, "The future of error events and MediaKeyError
 // is uncertain."
 // https://www.w3.org/Bugs/Public/show_bug.cgi?id=21798
+[Pref="media.eme.apiVisible"]
 interface MediaKeyError : Event {
   readonly attribute unsigned long systemCode;
 };

dom/webidl/MediaKeyMessageEvent.webidl

@@ -17,7 +17,7 @@ enum MediaKeyMessageType {
   "individualization-request"
 };
 
-[Constructor(DOMString type, optional MediaKeyMessageEventInit eventInitDict)]
+[Pref="media.eme.apiVisible", Constructor(DOMString type, optional MediaKeyMessageEventInit eventInitDict)]
 interface MediaKeyMessageEvent : Event {
   readonly attribute MediaKeyMessageType messageType;
   [Throws]

dom/webidl/MediaKeySession.webidl

@@ -10,6 +10,7 @@
  * W3C liability, trademark and document use rules apply.
  */
 
+[Pref="media.eme.apiVisible"]
 interface MediaKeySession : EventTarget {
   // error state
   readonly attribute MediaKeyError? error;

dom/webidl/MediaKeyStatusMap.webidl

@@ -20,6 +20,7 @@ enum MediaKeyStatus {
   "internal-error"
 };
 
+[Pref="media.eme.apiVisible"]
 interface MediaKeyStatusMap {
   iterable<ArrayBuffer,MediaKeyStatus>;
   readonly attribute unsigned long size;

dom/webidl/MediaKeySystemAccess.webidl

@@ -30,6 +30,7 @@ dictionary MediaKeySystemConfiguration {
   DOMString            videoType = "";
 };
 
+[Pref="media.eme.apiVisible"]
 interface MediaKeySystemAccess {
   readonly    attribute DOMString keySystem;
   [NewObject]

dom/webidl/MediaKeys.webidl

@@ -12,6 +12,7 @@
 
 enum SessionType { "temporary", "persistent" };
 
+[Pref="media.eme.apiVisible"]
 interface MediaKeys {
   readonly attribute DOMString keySystem;
 

dom/webidl/Navigator.webidl

@@ -452,7 +452,7 @@ partial interface Navigator {
 
 #ifdef MOZ_EME
 partial interface Navigator {
-  [NewObject]
+  [Pref="media.eme.apiVisible", NewObject]
   Promise<MediaKeySystemAccess>
   requestMediaKeySystemAccess(DOMString keySystem,
                               sequence<MediaKeySystemConfiguration> supportedConfigurations);