Commit cb73494b authored by Georg Koppen's avatar Georg Koppen
Browse files

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.
parent de57f2c4

src/chrome/locale/en/torbutton.dtd

+1 −1
Original line number Diff line number Diff line
@@ -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.">

src/modules/security-prefs.js

+3 −3
Original line number Diff line number Diff line
@@ -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],