Bug 921519 - Really disable the slow script dialog on b2g. r=bholley, a=koi+
authorBlake Kaplan <mrbkap@gmail.com>
Fri, 27 Sep 2013 14:37:30 -0400
changeset 155576 4c72e82e825faae3062e9b4c861cb8828dc60c9a
parent 155575 f45c9cf22f329ef6d800b6b7588a94f46febd2cf
child 155577 75e1f0a7290c624384d849853a6546322ffcd0dc
push id4329
push userryanvm@gmail.com
push dateMon, 30 Sep 2013 14:03:43 +0000
treeherdermozilla-aurora@75e1f0a7290c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley, koi
bugs921519
milestone26.0a2
Bug 921519 - Really disable the slow script dialog on b2g. r=bholley, a=koi+
b2g/app/b2g.js
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -172,20 +172,24 @@ pref("geo.enabled", true);
 // content sink control -- controls responsiveness during page load
 // see https://bugzilla.mozilla.org/show_bug.cgi?id=481566#c9
 pref("content.sink.enable_perf_mode",  2); // 0 - switch, 1 - interactive, 2 - perf
 pref("content.sink.pending_event_mode", 0);
 pref("content.sink.perf_deflect_count", 1000000);
 pref("content.sink.perf_parse_time", 50000000);
 
 // Maximum scripts runtime before showing an alert
-pref("dom.max_chrome_script_run_time", 0); // disable slow script dialog for chrome
 // Disable the watchdog thread for B2G. See bug 870043 comment 31.
 pref("dom.use_watchdog", false);
 
+// The slow script dialog can be triggered from inside the JS engine as well,
+// ensure that those calls don't accidentally trigger the dialog.
+pref("dom.max_script_run_time", 0);
+pref("dom.max_chrome_script_run_time", 0);
+
 // plugins
 pref("plugin.disable", true);
 pref("dom.ipc.plugins.enabled", true);
 
 // product URLs
 // The breakpad report server to link to in about:crashes
 pref("breakpad.reportURL", "https://crash-stats.mozilla.com/report/index/");
 pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/b2g/%VERSION%/releasenotes/");