Merge mozilla-central to autoland a=merge on a CLOSED TREE

trman · Feb 4, 2019 · 6674013 · 6674013
2 parents b59da61 + 98926c4
commit 6674013
Show file tree

Hide file tree

Showing 42 changed files with 988 additions and 965 deletions.
diff --git a/browser/components/aboutconfig/content/aboutconfig.html b/browser/components/aboutconfig/content/aboutconfig.html
@@ -18,14 +18,16 @@
     <title data-l10n-id="about-config-title"></title>
   </head>
   <body>
-    <div class="container">
+    <div class="container" role="alertdialog" aria-labelledby="warningTitle"
+         aria-describedby="warningDescription">
 
       <div class="title">
-        <h1 class="title-text" data-l10n-id="about-config-warning-title"></h1>
+        <h1 id="warningTitle" class="title-text"
+            data-l10n-id="about-config-warning-title"></h1>
       </div>
 
       <div class="description">
-        <p data-l10n-id="about-config-warning-text"></p>
+        <p id="warningDescription" data-l10n-id="about-config-warning-text"></p>
       </div>
 
       <div class="toggle-container-with-text">
@@ -35,7 +37,7 @@ <h1 class="title-text" data-l10n-id="about-config-warning-title"></h1>
       </div>
 
       <div class="button-container">
-        <button class="primary" onclick="onWarningButtonClick();"
+        <button autofocus class="primary" onclick="onWarningButtonClick();"
                 data-l10n-id="about-config-warning-button"></button>
       </div>
     </div>

diff --git a/browser/components/aboutconfig/content/aboutconfig.js b/browser/components/aboutconfig/content/aboutconfig.js
@@ -14,6 +14,12 @@ const GETTERS_BY_PREF_TYPE = {
   [Ci.nsIPrefBranch.PREF_STRING]: "getStringPref",
 };
 
+const STRINGS_ADD_BY_TYPE = {
+  Boolean: "about-config-pref-add-type-boolean",
+  Number: "about-config-pref-add-type-number",
+  String: "about-config-pref-add-type-string",
+};
+
 let gDefaultBranch = Services.prefs.getDefaultBranch("");
 let gFilterPrefsTask = new DeferredTask(() => filterPrefs(), SEARCH_TIMEOUT_MS);
 
@@ -207,7 +213,7 @@ class PrefRow {
           radio.checked = this.type == type;
           form.appendChild(radio);
           let radioLabel = document.createElement("span");
-          radioLabel.textContent = type;
+          document.l10n.setAttributes(radioLabel, STRINGS_ADD_BY_TYPE[type]);
           form.appendChild(radioLabel);
         }
         form.addEventListener("click", event => {

diff --git a/browser/locales/en-US/browser/aboutConfig.ftl b/browser/locales/en-US/browser/aboutConfig.ftl
@@ -20,6 +20,11 @@ about-config-pref-save = Save
 about-config-pref-reset = Reset
 about-config-pref-delete = Delete
 
+## Labels for the type selection radio buttons shown when adding preferences.
+about-config-pref-add-type-boolean = Boolean
+about-config-pref-add-type-number = Number
+about-config-pref-add-type-string = String
+
 ## Preferences with a non-default value are differentiated visually, and at the
 ## same time the state is made accessible to screen readers using an aria-label
 ## that won't be visible or copied to the clipboard.

diff --git a/devtools/client/shared/test/unit/test_escapeCSSComment.js b/devtools/client/shared/test/unit/test_escapeCSSComment.js
@@ -4,7 +4,7 @@
 "use strict";
 
 const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
-const {escapeCSSComment, _unescapeCSSComment} = require("devtools/shared/css/parsing-utils");
+const {escapeCSSComment, unescapeCSSComment} = require("devtools/shared/css/parsing-utils");
 
 const TEST_DATA = [
   {
@@ -33,7 +33,7 @@ function run_test() {
 
     const escaped = escapeCSSComment(test.input);
     equal(escaped, test.expected);
-    const unescaped = _unescapeCSSComment(escaped);
+    const unescaped = unescapeCSSComment(escaped);
     equal(unescaped, test.input);
   }
 }
diff --git a/devtools/client/shared/test/unit/test_rewriteDeclarations.js b/devtools/client/shared/test/unit/test_rewriteDeclarations.js
@@ -4,7 +4,7 @@
 "use strict";
 
 const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
-const {RuleRewriter} = require("devtools/shared/css/parsing-utils");
+const RuleRewriter = require("devtools/shared/fronts/inspector/rule-rewriter");
 const {isCssPropertyKnown} = require("devtools/server/actors/css-properties");
 
 const TEST_DATA = [

diff --git a/devtools/client/shared/view-source.js b/devtools/client/shared/view-source.js
@@ -52,7 +52,7 @@ exports.viewSourceInDebugger = async function(toolbox, sourceURL, sourceLine,
                                               reason = "unknown") {
   const dbg = await toolbox.loadTool("jsdebugger");
   const source = dbg.getSource(sourceURL);
-  if (source) {
+  if (source || await toolbox.sourceMapService.hasOriginalURL(sourceURL)) {
     await toolbox.selectTool("jsdebugger", reason);
     dbg.selectSource(sourceURL, sourceLine);
     return true;

diff --git a/devtools/client/webconsole/test/mochitest/browser.ini b/devtools/client/webconsole/test/mochitest/browser.ini
@@ -402,7 +402,7 @@ skip-if = verify
 [browser_webconsole_sourcemap_error.js]
 [browser_webconsole_sourcemap_invalid.js]
 [browser_webconsole_sourcemap_nosource.js]
-skip-if = true # will be fixed with 1523421
+skip-if = verify
 [browser_webconsole_split.js]
 [browser_webconsole_split_close_button.js]
 [browser_webconsole_split_escape_key.js]

diff --git a/devtools/client/webconsole/test/mochitest/head.js b/devtools/client/webconsole/test/mochitest/head.js
@@ -363,6 +363,12 @@ async function checkClickOnNode(hud, toolbox, frameLinkNode) {
   await onSourceInDebuggerOpened;
 
   const dbg = toolbox.getPanel("jsdebugger");
+
+  // Wait for the source to finish loading, if it is pending.
+  await waitFor(() => {
+    return !!dbg._selectors.getSelectedSource(dbg._getState());
+  });
+
   is(
     dbg._selectors.getSelectedSource(dbg._getState()).url,
     url,