Backing out 6f079f13c06a for bug 725869 a=me

This commit is contained in:
Alex Keybl 2012-02-22 12:13:12 -08:00
parent 1f2fc102d1
commit 1a0cdb0fb5

View File

@ -1514,14 +1514,14 @@ pref("plugins.click_to_play", false);
#ifndef DEBUG
// How long a plugin is allowed to process a synchronous IPC message
// before we consider it "hung".
pref("dom.ipc.plugins.timeoutSecs", 25);
pref("dom.ipc.plugins.timeoutSecs", 45);
// 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. Currently disabled.
pref("dom.ipc.plugins.parentTimeoutSecs", 0);
// How long a plugin launch is allowed to take before
// we consider it failed.
pref("dom.ipc.plugins.processLaunchTimeoutSecs", 25);
pref("dom.ipc.plugins.processLaunchTimeoutSecs", 45);
#else
// No timeout in DEBUG builds
pref("dom.ipc.plugins.timeoutSecs", 0);