commit cb73494b177f0dcb595920090a81af5621083f8d Author: Georg Koppen <gk@torproject.org> Date: Thu Apr 13 09:24:04 2017 +0000 Bug 21865: Update our JIT preferences in the slider It turns out that the JIT *.content prefs are gone for a while now. This happened in https://bugzilla.mozilla.org/show_bug.cgi?id=939562 and the patch updates the security slider to take this into account. We got the tip to include `javascript.options.native_regexp` as well. `javascript.options.typeinference` is gone with https://bugzilla.mozilla.org/show_bug.cgi?id=972817 and we therefore remove it. And asm.js is disabled globally until we find a good solution for #19417. The tooltip text got updated accordingly. --- src/chrome/locale/en/torbutton.dtd | 2 +- src/modules/security-prefs.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 97a994f..6bc7141 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index 4a39ca8..3d3630b 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -19,12 +19,12 @@ let log = (level, msg) => logger.log(level, msg); // corresponding to the old 2-medium-high setting. const kSecuritySettings = { // Preference name : [0, 1-high 2-m 3-m 4-low] - "javascript.options.ion.content" : [, false, false, false, true ], - "javascript.options.typeinference" : [, false, false, false, true ], + "javascript.options.ion" : [, false, false, false, true ], + "javascript.options.baselinejit" : [, false, false, false, true ], + "javascript.options.native_regexp" : [, false, false, false, true ], "noscript.forbidMedia" : [, true, true, true, false], "media.webaudio.enabled" : [, false, false, false, true ], "mathml.disabled" : [, true, true, true, false], - "javascript.options.baselinejit.content" : [, false, false, false, true ], "gfx.font_rendering.opentype_svg.enabled" : [, false, false, false, true ], "noscript.global" : [, false, false, false, true ], "noscript.globalHttpsWhitelist" : [, false, true, true, false],