Bug 1120993 - Backout changesets 6dbb4d7aa57d (bug 1125891) and 78a8db05e964 (bug 1119941) to enable Flash protected-mode. a=sledru
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 10 Feb 2015 09:32:26 -0500
changeset 243743 d02e363ecb6f
parent 243742 ff6bff2f5694
child 243744 33a2305f846a
push id4460
push userryanvm@gmail.com
push date2015-02-10 14:41 +0000
treeherdermozilla-beta@a00e758a0460 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssledru
bugs1120993, 1125891, 1119941
milestone36.0
Bug 1120993 - Backout changesets 6dbb4d7aa57d (bug 1125891) and 78a8db05e964 (bug 1119941) to enable Flash protected-mode. a=sledru
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1175,19 +1175,16 @@ pref("browser.bookmarks.editDialog.first
 
 // Whether to use a panel that looks like an OS X sheet for customization
 #ifdef XP_MACOSX
 pref("toolbar.customization.usesheet", true);
 #else
 pref("toolbar.customization.usesheet", false);
 #endif
 
-// Disable Flash protected mode to reduce hang/crash rates.
-pref("dom.ipc.plugins.flash.disable-protected-mode", true);
-
 #ifdef XP_MACOSX
 // On mac, the default pref is per-architecture
 pref("dom.ipc.plugins.enabled.i386", true);
 pref("dom.ipc.plugins.enabled.x86_64", true);
 #else
 pref("dom.ipc.plugins.enabled", true);
 #endif
 
@@ -1195,17 +1192,17 @@ pref("dom.ipc.plugins.enabled", true);
 pref("browser.tabs.remote.autostart", false);
 pref("browser.tabs.remote.desktopbehavior", true);
 
 #if defined(XP_WIN) && defined(MOZ_SANDBOX)
 // Controls whether the Windows NPAPI plugin process is sandboxed by default.
 // To get a different setting for a particular plugin replace "default", with
 // the plugin's nice file name, see: nsPluginTag::GetNiceFileName.
 pref("dom.ipc.plugins.sandbox.default", false);
-pref("dom.ipc.plugins.sandbox.flash", true);
+pref("dom.ipc.plugins.sandbox.flash", false);
 #endif
 
 #if defined(MOZ_CONTENT_SANDBOX) && defined(XP_WIN)
 // This controls whether the content process on Windows is sandboxed.
 // You also need to be using remote tabs, see above.
 // on = full sandbox enabled
 // warn = warn only sandbox enabled
 // anything else = sandbox disabled