[tor-commits] [torbutton/master] Bug 19417: Disable asmjs on safer and safest sec levels

[gk at torproject.org]

commit dd746af135904c905cbcdf8792fbd6702814fb37
Author: Alex Catarineu <acat at torproject.org>
Date:   Thu Oct 3 16:50:12 2019 +0200

    Bug 19417: Disable asmjs on safer and safest sec levels
---
 chrome/content/torbutton.js | 16 ----------------
 modules/security-prefs.js   |  1 +
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js
index 94206ea5..907e4278 100644
--- a/chrome/content/torbutton.js
+++ b/chrome/content/torbutton.js
@@ -336,22 +336,6 @@ function torbutton_init() {
 
     setupPreferencesForMobile();
 
-    // XXX: Get rid of the cached asmjs (or IndexedDB) files on disk in case we
-    // don't allow things saved to disk. This is an ad-hoc fix to work around
-    // #19417. Once this is properly solved we should remove this code again.
-    if (m_tb_prefs.getBoolPref("browser.privatebrowsing.autostart")) {
-      let orig_quota_test = m_tb_prefs.getBoolPref("dom.quotaManager.testing");
-      try {
-        // This works only by setting the pref to `true` otherwise we get an
-        // exception and nothing is happening.
-        m_tb_prefs.setBoolPref("dom.quotaManager.testing", true);
-        Services.qms.clear();
-      } catch (e) {
-      } finally {
-        m_tb_prefs.setBoolPref("dom.quotaManager.testing", orig_quota_test);
-      }
-    }
-
     // listen for our toolbar button being added so we can initialize it
     torbutton_init_toolbutton();
 
diff --git a/modules/security-prefs.js b/modules/security-prefs.js
index ffc5ee39..8701a3b8 100644
--- a/modules/security-prefs.js
+++ b/modules/security-prefs.js
@@ -27,6 +27,7 @@ const kSecuritySettings = {
   "mathml.disabled" :                         [,  true,  true,  true,  false],
   "gfx.font_rendering.opentype_svg.enabled" : [,  false, false, false, true ],
   "svg.disabled" :                            [,  true,  false, false, false],
+  "javascript.options.asmjs" :                [,  false, false, false, true ],
 };
 
 // The Security Settings prefs in question.