Bug 1040996 - disable Flash in the desktop runtime; r=marco
authorMyk Melez <myk@mozilla.org>
Sat, 19 Jul 2014 13:42:10 -0700
changeset 217104 88a6043b07e01b87e94f95e60563174047c91227
parent 217103 8e6b2cf3b2e628dad87540dca2bd0572613dfd2f
child 217105 225fa7edfb16880d1f687eacea2d7bb41d75b553
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarco
bugs1040996
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1040996 - disable Flash in the desktop runtime; r=marco
webapprt/prefs.js
--- a/webapprt/prefs.js
+++ b/webapprt/prefs.js
@@ -72,17 +72,19 @@ pref("dom.payment.provider.0.description
 pref("dom.payment.provider.0.uri", "https://marketplace.firefox.com/mozpay/?req=");
 pref("dom.payment.provider.0.type", "mozilla/payments/pay/v1");
 pref("dom.payment.provider.0.requestMethod", "GET");
 #endif
 
 // Enable window resize and move
 pref("dom.always_allow_move_resize_window", true);
 
-pref("plugin.allowed_types", "application/x-shockwave-flash,application/futuresplash");
+// Disable all plugins.  This has to be a non-empty string to disable plugins;
+// otherwise, nsPluginHost::IsTypeWhitelisted assumes all plugins are enabled.
+pref("plugin.allowed_types", " ");
 
 pref("devtools.debugger.remote-enabled", true);
 pref("devtools.debugger.force-local", true);
 
 // The default for this pref reflects whether the build is capable of IPC.
 // (Turning it on in a no-IPC build will have no effect.)
 #ifdef XP_MACOSX
 // i386 ipc preferences