Bug 1304899 - Don't download Adobe Primetime CDM by default. r?kentuckyfriedtakahe draft
authorChris Pearce <cpearce@mozilla.com>
Fri, 23 Sep 2016 10:31:16 +1200
changeset 416727 1f7e4ffaf0036fe8f812dc8882701259e038c3df
parent 416562 f0e6cc6360213ba21fd98c887b55fce5c680df68
child 531939 fa89e3dba43cd96d2f89da92cf901aa4514ececf
push id30235
push usercpearce@mozilla.com
push dateThu, 22 Sep 2016 22:34:22 +0000
reviewerskentuckyfriedtakahe
bugs1304899
milestone52.0a1
Bug 1304899 - Don't download Adobe Primetime CDM by default. r?kentuckyfriedtakahe Disabling the Adobe CDM but leaving it visible means that we won't download it and if a site tries to use it we will prompt the user to enable DRM and only then download it. MozReview-Commit-ID: LtEr0NJMiQM
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1356,17 +1356,21 @@ pref("media.gmp.trial-create.enabled", t
 // plugins list, Firefox will download the GMP/CDM if enabled, and our
 // UI to re-enable EME prompts the user to re-enable EME if it's disabled
 // and script requests EME. If *.visible is false, we won't show the UI
 // to enable the CDM if its disabled; it's as if the keysystem is completely
 // unsupported.
 
 #ifdef MOZ_ADOBE_EME
 pref("media.gmp-eme-adobe.visible", true);
-pref("media.gmp-eme-adobe.enabled", true);
+// When Adobe EME is enabled in the build system, we don't actually enable
+// the plugin by default, so that it doesn't download and install by default.
+// When Adobe EME is first used, Firefox will prompt the user to enable it,
+// and then download the CDM.
+pref("media.gmp-eme-adobe.enabled", false);
 #endif
 
 #ifdef MOZ_WIDEVINE_EME
 pref("media.gmp-widevinecdm.visible", true);
 pref("media.gmp-widevinecdm.enabled", true);
 #endif
 
 // Play with different values of the decay time and get telemetry,