Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1123956 - [e10s] Tweak timeout values for slow script UI (r=mrbkap)

Browse Source
This commit is contained in:
Bill McCloskey 2015-01-20 15:42:05 -08:00
parent 91742f015d
commit 8d8c31d1df
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/modules/ProcessHangMonitor.jsm
View File

@ -20,10 +20,10 @@ Cu.import("resource://gre/modules/Services.jsm");
*/
/**
* If a hang hasn't been reported for more than 5 seconds, assume the
* If a hang hasn't been reported for more than 10 seconds, assume the
* content process has gotten unstuck (and hide the hang notification).
*/
const HANG_EXPIRATION_TIME = 5000;
const HANG_EXPIRATION_TIME = 10000;
let ProcessHangMonitor = {
/**

4
modules/libpref/init/all.js
View File

@ -2278,7 +2278,7 @@ pref("editor.positioning.offset", 0);
pref("dom.use_watchdog", true);
pref("dom.max_chrome_script_run_time", 20);
pref("dom.max_child_script_run_time", 2);
pref("dom.max_child_script_run_time", 10);
pref("dom.max_script_run_time", 10);
// If true, ArchiveReader will be enabled
@ -2327,7 +2327,7 @@ pref("dom.ipc.plugins.timeoutSecs", 45);
pref("dom.ipc.plugins.parentTimeoutSecs", 0);
// How long a plugin in e10s is allowed to process a synchronous IPC
// message before we notify the chrome process of a hang.
pref("dom.ipc.plugins.contentTimeoutSecs", 2);
pref("dom.ipc.plugins.contentTimeoutSecs", 45);
// How long a plugin launch is allowed to take before
// we consider it failed.
pref("dom.ipc.plugins.processLaunchTimeoutSecs", 45);