diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
| commit | a42bed2e9a78715889240ff900e2391bef923285 (patch) | |
| tree | 202c502b7e964384fb7f0639b756353374b0c045 /modules/libpref/init/all.js | |
| parent | 9a2224a97c7d258fc1f0e5fad30706987880ce22 (diff) | |
| parent | 276f6583e00edf2a217a3092471ca2aa3aab5a09 (diff) | |
| download | UXP-a42bed2e9a78715889240ff900e2391bef923285.tar UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.gz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.lz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.xz UXP-a42bed2e9a78715889240ff900e2391bef923285.zip | |
Merge branch 'master' into remove-unboxed
# Conflicts:
# js/src/jit/BaselineIC.cpp
# js/src/jsarray.cpp
Diffstat (limited to 'modules/libpref/init/all.js')
| -rw-r--r-- | modules/libpref/init/all.js | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index d5005cbdd..f761c70b9 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1319,12 +1319,7 @@ pref("javascript.options.mem.gc_max_empty_chunk_count", 30); pref("javascript.options.showInConsole", false); -#ifdef RELEASE_OR_BETA -// Disabled in Beta and Release for now, see bug 1225406 -pref("javascript.options.shared_memory", false); -#else pref("javascript.options.shared_memory", true); -#endif pref("javascript.options.throw_on_debuggee_would_run", false); pref("javascript.options.dump_stack_on_debuggee_would_run", false); |