Bug 868184 - OdinMonkey: enable by default on beta/release (r=vlad)

--HG--
extra : rebase_source : c97bf37723eded74f95aae21e2baa692cf059c2e
This commit is contained in:
Luke Wagner 2013-05-07 13:34:17 -07:00
parent e45dc0e0b5
commit 262b462c83
4 changed files with 4 additions and 9 deletions

View File

@ -973,7 +973,7 @@ static const char js_disable_explicit_compartment_gc[] =
static const char js_baselinejit_content_str[] = JS_OPTIONS_DOT_STR "baselinejit.content";
static const char js_baselinejit_chrome_str[] = JS_OPTIONS_DOT_STR "baselinejit.chrome";
static const char js_ion_content_str[] = JS_OPTIONS_DOT_STR "ion.content";
static const char js_asmjs_content_str[] = JS_OPTIONS_DOT_STR "experimental_asmjs";
static const char js_asmjs_content_str[] = JS_OPTIONS_DOT_STR "asmjs";
static const char js_ion_parallel_compilation_str[] = JS_OPTIONS_DOT_STR "ion.parallel_compilation";
int

View File

@ -179,7 +179,7 @@ const char* gPrefsToWatch[] = {
JS_OPTIONS_DOT_STR "mem.max",
JS_OPTIONS_DOT_STR "baselinejit.content",
JS_OPTIONS_DOT_STR "ion.content",
JS_OPTIONS_DOT_STR "experimental_asmjs",
JS_OPTIONS_DOT_STR "asmjs",
"dom.workers.mem.gc_allocation_threshold_mb"
#ifdef JS_GC_ZEAL

View File

@ -5660,8 +5660,7 @@ js::CompileAsmJS(JSContext *cx, TokenStream &ts, ParseNode *fn, const CompileOpt
return Warn(cx, JSMSG_USE_ASM_TYPE_FAIL, "Disabled by lack of floating point support");
if (!cx->hasOption(JSOPTION_ASMJS))
return Warn(cx, JSMSG_USE_ASM_TYPE_FAIL, "Disabled by javascript.options.experimental_asmjs "
"in about:config");
return Warn(cx, JSMSG_USE_ASM_TYPE_FAIL, "Disabled by javascript.options.asmjs in about:config");
if (cx->compartment->debugMode())
return Warn(cx, JSMSG_USE_ASM_TYPE_FAIL, "Disabled by debugger");

View File

@ -782,11 +782,7 @@ pref("javascript.options.methodjit.chrome", false);
pref("javascript.options.baselinejit.content", true);
pref("javascript.options.baselinejit.chrome", true);
pref("javascript.options.ion.content", true);
#ifdef RELEASE_BUILD
pref("javascript.options.experimental_asmjs", false);
#else
pref("javascript.options.experimental_asmjs", true);
#endif
pref("javascript.options.asmjs", true);
pref("javascript.options.ion.parallel_compilation", true);
pref("javascript.options.pccounts.content", false);
pref("javascript.options.pccounts.chrome", false);