diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-28 20:27:47 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-28 20:27:47 -0500 |
| commit | d78e03d528ba9e7395160a23bce23726067600dd (patch) | |
| tree | e8314f3d55f136a6db6bb9e2a035ae68a04dc3e9 /devtools | |
| parent | bebeb4e26a35df99e19b6c44fc957ad6c14e9059 (diff) | |
| parent | 33523f5d5ed0c3b8000aae21a50a56c238422db3 (diff) | |
| download | uxp-d78e03d528ba9e7395160a23bce23726067600dd.tar.gz | |
Merge branch 'master' into 1829
* master:
No issue - Update README and SECURITY
Issue #1885 - Follow-up: Update error message if invalid rootMargin specified.
Issue #1879 - Follow-up: Update config/external/nss/target to security/target.
Issue #1885 - Allow unitless rootMargin entries for IntersectionObserver.
Issue #1879 - Revert changes to cryptox.h
Revert "Issue #1879 - spot-fix typo in cryptox.h"
Issue #1879 - spot-fix typo in cryptox.h
Issue #21 - Change MappedAttrParser to store its nsIPrincipal instead of nsSVGElement
Issue #21 - Remove use counters telemetry
Issue #1881 - Interpret empty or whitespace root margin string as zero length
Issue #1877 - Resolve NIGHTLY_BUILD conditionals.
Issue #1880 - Boot Comic Sans out of the font configuration.
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/client/preferences/devtools.js | 12 | ||||
| -rw-r--r-- | devtools/shared/tests/unit/xpcshell.ini | 6 |
2 files changed, 2 insertions, 16 deletions
diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js index 2f31e18e30..a8c4e119ee 100644 --- a/devtools/client/preferences/devtools.js +++ b/devtools/client/preferences/devtools.js @@ -146,12 +146,8 @@ pref("devtools.performance.ui.show-triggers-for-gc-types", // TODO remove once we have flame charts via bug 1148663 pref("devtools.performance.ui.enable-memory-flame", false); -// Enable experimental options in the UI only in Nightly -#if defined(NIGHTLY_BUILD) -pref("devtools.performance.ui.experimental", true); -#else +// Enable experimental options in the UI? pref("devtools.performance.ui.experimental", false); -#endif // The default cache UI setting pref("devtools.cache.disabled", false); @@ -304,12 +300,8 @@ pref("devtools.webconsole.timestampMessages", false); // to automatically trigger multiline editing (equivalent to shift + enter). pref("devtools.webconsole.autoMultiline", true); -// Enable the experimental webconsole frontend -#if defined(NIGHTLY_BUILD) -pref("devtools.webconsole.new-frontend-enabled", true); -#else +// Enable the experimental webconsole frontend? pref("devtools.webconsole.new-frontend-enabled", false); -#endif // Enable the experimental support for source maps in console (work in progress) pref("devtools.sourcemap.locations.enabled", false); diff --git a/devtools/shared/tests/unit/xpcshell.ini b/devtools/shared/tests/unit/xpcshell.ini index d0323c813c..92a561e8c3 100644 --- a/devtools/shared/tests/unit/xpcshell.ini +++ b/devtools/shared/tests/unit/xpcshell.ini @@ -9,12 +9,6 @@ support-files = [test_assert.js] [test_csslexer.js] -[test_css-properties-db.js] -# This test only enforces that the CSS database is up to date with nightly. The DB is -# only used when inspecting a target that doesn't support the getCSSDatabase actor. -# CSS properties are behind compile-time flags, and there is no automatic rebuild -# process for uplifts, so this test breaks on uplift. -run-if = nightly_build [test_fetch-bom.js] [test_fetch-chrome.js] [test_fetch-file.js] |