Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-07-25 06:31:41 +08:00
commit f35488b465
5 changed files with 30 additions and 20 deletions

View file

@ -1363,7 +1363,3 @@ pref("services.sync.validation.enabled", true);
// The counter resets when the page is reloaded from the UI
// (content-reloads do NOT clear this to mitigate reloading tricks).
pref("prompts.authentication_dialog_abuse_limit", 3);
// Enable WASM and its baseline jit (platform default is false)
pref("javascript.options.wasm", true);
pref("javascript.options.wasm_baselinejit", true);

View file

@ -32,6 +32,10 @@
type="wstring"
onchange="gContentPane._rebuildFonts();"/>
<!-- JavaScript -->
<preference id="javascript.options.wasm" name="javascript.options.wasm" type="bool"/>
<!-- VIDEO -->
<preference id="media.mediasource.enabled" name="media.mediasource.enabled" type="bool"/>
<preference id="media.mediasource.mp4.enabled" name="media.mediasource.mp4.enabled" type="bool"/>
@ -153,6 +157,14 @@
</hbox>
</groupbox>
<!-- Javascript -->
<groupbox id="jsOptionsGroup">
<caption label="&jsOptions.label;"/>
<checkbox id="jsOptionsWasm" preference="javascript.options.wasm"
label="&jsOptionsWasm.label;" accesskey="&jsOptionsWasm.accesskey;"/>
</groupbox>
<!-- Video -->
<groupbox id="videoGroup">
<caption label="&video.label;"/>

View file

@ -30,6 +30,10 @@
<!ENTITY chooseButton.label "Choose…">
<!ENTITY chooseButton.accesskey "o">
<!ENTITY jsOptions.label "JavaScript">
<!ENTITY jsOptionsWasm.label "Enable WebAssembly (WASM)">
<!ENTITY jsOptionsWasm.accesskey "y">
<!ENTITY video.label "Video">
<!ENTITY videoMSE.label "Enable Media Source Extensions (MSE)">
<!ENTITY videoMSE.accesskey "M">

View file

@ -1265,8 +1265,14 @@ pref("javascript.options.unboxed_objects", false);
pref("javascript.options.baselinejit", true);
pref("javascript.options.ion", true);
pref("javascript.options.asmjs", true);
pref("javascript.options.wasm", false);
pref("javascript.options.wasm", true);
// wasm jit crashes in 32bit builds because of 64bit casts so
// only enable it by default for 64bit builds
#ifdef HAVE_64BIT_BUILD
pref("javascript.options.wasm_baselinejit", true);
#else
pref("javascript.options.wasm_baselinejit", false);
#endif
pref("javascript.options.native_regexp", true);
pref("javascript.options.parallel_parsing", true);
// ayncstack is used for debugging promises in devtools.
@ -2483,7 +2489,7 @@ pref("layout.css.scroll-snap.prediction-max-velocity", 2000);
pref("layout.css.scroll-snap.prediction-sensitivity", "0.750");
// Is support for basic shapes in clip-path enabled?
pref("layout.css.clip-path-shapes.enabled", false);
pref("layout.css.clip-path-shapes.enabled", true);
// Is support for DOMPoint enabled?
pref("layout.css.DOMPoint.enabled", true);
@ -2495,18 +2501,10 @@ pref("layout.css.DOMQuad.enabled", true);
pref("layout.css.DOMMatrix.enabled", true);
// Is support for GeometryUtils.getBoxQuads enabled?
#ifdef RELEASE_OR_BETA
pref("layout.css.getBoxQuads.enabled", false);
#else
pref("layout.css.getBoxQuads.enabled", true);
#endif
// Is support for GeometryUtils.convert*FromNode enabled?
#ifdef RELEASE_OR_BETA
pref("layout.css.convertFromNode.enabled", false);
#else
pref("layout.css.convertFromNode.enabled", true);
#endif
// Is support for CSS "text-align: unsafe X" enabled?
pref("layout.css.text-align-unsafe-value.enabled", false);
@ -2516,11 +2514,7 @@ pref("layout.css.text-justify.enabled", true);
// Is support for CSS "float: inline-{start,end}" and
// "clear: inline-{start,end}" enabled?
#if !defined(RELEASE_OR_BETA)
pref("layout.css.float-logical-values.enabled", true);
#else
pref("layout.css.float-logical-values.enabled", false);
#endif
// Is support for the CSS4 image-orientation property enabled?
pref("layout.css.image-orientation.enabled", true);

View file

@ -6477,8 +6477,12 @@ AddonInternal.prototype = {
return false;
#endif
}
else if (app.id == TOOLKIT_ID)
version = aPlatformVersion
else if (app.id == TOOLKIT_ID) {
#ifdef MOZ_PHOENIX_EXTENSIONS
this.native = true;
#endif
version = aPlatformVersion;
}
// Only extensions and dictionaries can be compatible by default; themes
// and language packs always use strict compatibility checking.