Merge mozilla-central and mozilla-inbound
authorEd Morley <bmo@edmorley.co.uk>
Sat, 26 Nov 2011 08:20:32 +0000
changeset 82445 c58bad0b4640797f19541cc367d8ee0871457b71
parent 82444 b5782f6da550cb181a7ee27a1b7f6d9de872f133 (current diff)
parent 82421 6f079f13c06a6f4d4c545e23d354d7966dd61e47 (diff)
child 82446 3258ba3a269d5e865b720c853120e088d4537e10
child 82473 ec749c25ed6402bba08463dafe33c73bc4466829
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone11.0a1
first release with
nightly linux32
c58bad0b4640 / 11.0a1 / 20111126031027 / files
nightly linux64
c58bad0b4640 / 11.0a1 / 20111126031027 / files
nightly mac
c58bad0b4640 / 11.0a1 / 20111126031027 / files
nightly win32
c58bad0b4640 / 11.0a1 / 20111126031027 / files
nightly win64
c58bad0b4640 / 11.0a1 / 20111126031027 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central and mozilla-inbound
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1463,33 +1463,38 @@ pref("gestures.enable_single_finger_inpu
 pref("editor.resizing.preserve_ratio",       true);
 pref("editor.positioning.offset",            0);
 
 pref("dom.max_chrome_script_run_time", 20);
 pref("dom.max_script_run_time", 10);
 
 // Hang monitor timeout after which we kill the browser, in seconds
 // (0 is disabled)
+// Temporarily disabled on mac due to bug 705154
+#ifdef XP_MACOSX
+pref("hangmonitor.timeout", 0);
+#else
 #ifndef DEBUG
 pref("hangmonitor.timeout", 30);
 #else
 pref("hangmonitor.timeout", 0);
 #endif
+#endif
 
 #ifndef DEBUG
 // How long a plugin is allowed to process a synchronous IPC message
 // before we consider it "hung".
-pref("dom.ipc.plugins.timeoutSecs", 45);
+pref("dom.ipc.plugins.timeoutSecs", 25);
 // How long a plugin process will wait for a response from the parent
 // to a synchronous request before terminating itself. After this
 // point the child assumes the parent is hung.
 pref("dom.ipc.plugins.parentTimeoutSecs", 15);
 // How long a plugin launch is allowed to take before
 // we consider it failed.
-pref("dom.ipc.plugins.processLaunchTimeoutSecs", 45);
+pref("dom.ipc.plugins.processLaunchTimeoutSecs", 25);
 #else
 // No timeout in DEBUG builds
 pref("dom.ipc.plugins.timeoutSecs", 0);
 pref("dom.ipc.plugins.processLaunchTimeoutSecs", 0);
 pref("dom.ipc.plugins.parentTimeoutSecs", 0);
 #endif
 
 // Disable oopp for standard java. They run their own process isolation (which