mozilla-beta: changeset 46286:18c4baeeba95fd06c1f21f36beae299cf176409c

author	Justin Dolske <dolske@mozilla.com>
	Sat, 26 Jun 2010 14:45:56 -0700
changeset 46286	18c4baeeba95fd06c1f21f36beae299cf176409c
parent 46285	5da9fc2be83585333b108f45407d3be37088db5f
child 46287	0030881d9ad1b37c7f4c9099e54ef95d85f54d2c
push id	1
push user	root
push date	Tue, 26 Apr 2011 22:38:44 +0000
treeherder	mozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	shaver
bugs	574905
milestone	1.9.3a6pre
first release with	nightly linux32 6b36b6da79bd / 3.7a6pre / 20100627031044 / files nightly linux64 6b36b6da79bd / 3.7a6pre / 20100627030756 / files nightly mac 6b36b6da79bd / 3.7a6pre / 20100627031133 / files nightly win32 6b36b6da79bd / 3.7a6pre / 20100627035822 / files nightly win64 0030881d9ad1 / 3.7a6pre / 20100626155839 / files
last release without	nightly linux32 fae5d6bd9c53 / 3.7a6pre / 20100626030647 / files nightly linux64 fae5d6bd9c53 / 3.7a6pre / 20100626031037 / files nightly mac fae5d6bd9c53 / 3.7a6pre / 20100626031037 / files nightly win32 fae5d6bd9c53 / 3.7a6pre / 20100626035857 / files nightly win64 fae5d6bd9c53 / 3.7a6pre / 20100626041512 / files

--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1251,20 +1251,18 @@ 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);
 
 // How long a plugin is allowed to process a synchronous IPC message
 // before we consider it "hung".
-//
-// NB: chosen to match dom.max_script_run_time by default
 #ifndef DEBUG
-pref("dom.ipc.plugins.timeoutSecs", 10);
+pref("dom.ipc.plugins.timeoutSecs", 45);
 #else
 // No timeout in DEBUG builds
 pref("dom.ipc.plugins.timeoutSecs", 0);
 #endif
 
 #ifndef ANDROID
 #ifndef XP_MACOSX
 #ifdef XP_UNIX