Bug 1120993 - Backout bug 1125891 and bug 1119941 to return to default settings for Flash protected mode and our internal sandbox. a=lmandel
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 10 Feb 2015 09:32:26 -0500
changeset 250230 25f45020179b
parent 250229 8abdbdecd2d6
child 250231 cdd3d780401e
push id4522
push userbsmedberg@mozilla.com
push date2015-03-04 16:32 +0000
treeherdermozilla-beta@25f45020179b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslmandel
bugs1120993, 1125891, 1119941
milestone37.0
Bug 1120993 - Backout bug 1125891 and bug 1119941 to return to default settings for Flash protected mode and our internal sandbox. a=lmandel
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1157,18 +1157,17 @@ 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);
+pref("dom.ipc.plugins.flash.disable-protected-mode", false);
 
 #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
@@ -1183,17 +1182,16 @@ pref("browser.tabs.remote.desktopbehavio
 // process and also if they are subsequently allowed by the broker process.
 // This will require a restart.
 pref("security.sandbox.windows.log", false);
 
 // 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);
 
 #if defined(MOZ_CONTENT_SANDBOX)
 // This controls whether the Windows content process sandbox is using a more
 // strict sandboxing policy.  This will require a restart.
 pref("security.sandbox.windows.content.moreStrict", false);
 
 #if defined(MOZ_STACKWALKING)
 // This controls the depth of stack trace that is logged when Windows sandbox