Merge autoland to mozilla-central. a=merge

browser/components/aboutlogins/content/aboutLogins.html

@@ -198,6 +198,7 @@ <h2 class="title">
               <div class="reveal-password-wrapper">
                 <input type="password"
                        name="password"
+                       autocomplete="off"
                        dir="ltr"
                        required
                        readonly/>

browser/components/aboutlogins/content/components/fxaccounts-button.css

@@ -28,7 +28,6 @@
 }
 
 .fxaccount-email {
-  font-weight: 600;
   font-size: .9em;
   vertical-align: middle;
 }

browser/components/aboutlogins/content/components/login-item.css

@@ -148,7 +148,7 @@ input[type="url"][readOnly]:hover:active {
   display: block;
   font-size: smaller;
   color: var(--in-content-deemphasized-text);
-  margin-bottom: 5px;
+  margin-bottom: 8px;
 }
 
 :host([data-editing]) .detail-cell input:not([readOnly]):not([type="checkbox"]) {

browser/components/aboutlogins/content/components/login-item.js

@@ -146,7 +146,8 @@ export default class LoginItem extends HTMLElement {
     this._title.textContent = this._login.title;
     this._originInput.defaultValue = this._login.origin || "";
     this._usernameInput.defaultValue = this._login.username || "";
-    this._passwordInput.defaultValue = this._login.password || "";
+    // The password gets filled in _updatePasswordRevealState
+
     if (this.dataset.editing) {
       this._usernameInput.removeAttribute("data-l10n-id");
       this._usernameInput.placeholder = "";
@@ -246,7 +247,8 @@ export default class LoginItem extends HTMLElement {
       case "click": {
         let classList = event.currentTarget.classList;
         if (classList.contains("reveal-password-checkbox")) {
-          if (this._revealCheckbox.checked) {
+          // We prompt for the master password when entering edit mode already.
+          if (this._revealCheckbox.checked && !this.dataset.editing) {
             let masterPasswordAuth = await new Promise(resolve => {
               window.AboutLoginsUtils.promptForMasterPassword(resolve);
             });
@@ -344,6 +346,13 @@ export default class LoginItem extends HTMLElement {
           return;
         }
         if (classList.contains("edit-button")) {
+          let masterPasswordAuth = await new Promise(resolve => {
+            window.AboutLoginsUtils.promptForMasterPassword(resolve);
+          });
+          if (!masterPasswordAuth) {
+            return;
+          }
+
           this._toggleEditing();
           this.render();
 
@@ -680,7 +689,15 @@ export default class LoginItem extends HTMLElement {
 
     let { checked } = this._revealCheckbox;
     let inputType = checked ? "text" : "password";
-    this._passwordInput.setAttribute("type", inputType);
+    this._passwordInput.type = inputType;
+    // Don't include the password value in the attribute when it's supposed to be
+    // masked so that it's not trivial to bypass the Master Password prompt with
+    // the inspector in devtools.
+    let password = this._login.password || "";
+    // We prompt for the master password before entering edit mode so we can use
+    // the password in the markup then.
+    this._passwordInput.defaultValue =
+      checked || this.dataset.editing ? password : " ".repeat(password.length);
   }
 }
 customElements.define("login-item", LoginItem);

browser/components/aboutlogins/tests/browser/browser_aaa_eventTelemetry_run_first.js

@@ -79,7 +79,7 @@ add_task(async function test_telemetry_events() {
 
   let promiseNewTab = BrowserTestUtils.waitForNewTab(
     gBrowser,
-    TEST_LOGIN2.origin
+    TEST_LOGIN2.origin + "/"
   );
   await ContentTask.spawn(gBrowser.selectedBrowser, null, async function() {
     let loginItem = content.document.querySelector("login-item");

browser/components/aboutlogins/tests/browser/browser_openSite.js

@@ -16,7 +16,7 @@ add_task(async function setup() {
 add_task(async function test_launch_login_item() {
   let promiseNewTab = BrowserTestUtils.waitForNewTab(
     gBrowser,
-    TEST_LOGIN1.origin
+    TEST_LOGIN1.origin + "/"
   );
 
   let browser = gBrowser.selectedBrowser;

browser/components/aboutlogins/tests/browser/browser_updateLogin.js

@@ -63,6 +63,10 @@ add_task(async function test_login_item() {
 
       async function test_discard_dialog(exitPoint) {
         editButton.click();
+        await ContentTaskUtils.waitForCondition(
+          () => loginItem.dataset.editing,
+          "Entering edit mode"
+        );
         await Promise.resolve();
 
         usernameInput.value += "-undome";
@@ -102,7 +106,7 @@ add_task(async function test_login_item() {
         );
         is(
           passwordInput.value,
-          login.password,
+          " ".repeat(login.password.length),
           "Password change should be reverted"
         );
         is(
@@ -118,6 +122,10 @@ add_task(async function test_login_item() {
       await test_discard_dialog(cancelButton);
 
       editButton.click();
+      await ContentTaskUtils.waitForCondition(
+        () => loginItem.dataset.editing,
+        "Entering edit mode"
+      );
       await Promise.resolve();
 
       let revealCheckbox = loginItem.shadowRoot.querySelector(
@@ -132,6 +140,8 @@ add_task(async function test_login_item() {
       usernameInput.value += "-saveme";
       passwordInput.value += "-saveme";
 
+      // Cache the value since it will change upon leaving edit mode.
+      let passwordInputValue = passwordInput.value;
       ok(loginItem.dataset.editing, "LoginItem should be in 'edit' mode");
 
       let saveChangesButton = loginItem.shadowRoot.querySelector(
@@ -145,7 +155,7 @@ add_task(async function test_login_item() {
         return (
           updatedLogin &&
           updatedLogin.username == usernameInput.value &&
-          updatedLogin.password == passwordInput.value
+          updatedLogin.password == passwordInputValue
         );
       }, "Waiting for corresponding login in login list to update");
 
@@ -164,6 +174,10 @@ add_task(async function test_login_item() {
       );
 
       editButton.click();
+      await ContentTaskUtils.waitForCondition(
+        () => loginItem.dataset.editing,
+        "Entering edit mode"
+      );
       await Promise.resolve();
 
       ok(loginItem.dataset.editing, "LoginItem should be in 'edit' mode");

browser/components/aboutlogins/tests/browser/head.js

@@ -8,17 +8,17 @@ let nsLoginInfo = new Components.Constructor(
 );
 
 let TEST_LOGIN1 = new nsLoginInfo(
-  "https://example.com/",
-  "https://example.com/",
+  "https://example.com",
+  "https://example.com",
   null,
   "user1",
   "pass1",
   "username",
   "password"
 );
 let TEST_LOGIN2 = new nsLoginInfo(
-  "https://2.example.com/",
-  "https://2.example.com/",
+  "https://2.example.com",
+  "https://2.example.com",
   null,
   "user2",
   "pass2",
@@ -27,8 +27,8 @@ let TEST_LOGIN2 = new nsLoginInfo(
 );
 
 let TEST_LOGIN3 = new nsLoginInfo(
-  "https://breached.com/",
-  "https://breached.com/",
+  "https://breached.com",
+  "https://breached.com",
   null,
   "breachedLogin1",
   "pass3",

browser/components/aboutlogins/tests/chrome/test_login_item.html

@@ -89,7 +89,7 @@
   let usernameInput = gLoginItem.shadowRoot.querySelector("input[name='username']");
   is(usernameInput.value, TEST_LOGIN_1.username, "username should be populated");
   is(document.l10n.getAttributes(usernameInput).id, "about-logins-login-item-username", "username field should have default placeholder when not editing");
-  is(gLoginItem.shadowRoot.querySelector("input[name='password']").value, TEST_LOGIN_1.password, "password should be populated");
+  is(gLoginItem.shadowRoot.querySelector("input[name='password']").value.length, TEST_LOGIN_1.password.length, "password mask text should be populated");
   is(document.l10n.getAttributes(gLoginItem.shadowRoot.querySelector(".time-created")).args.timeCreated, TEST_LOGIN_1.timeCreated, "time-created should be populated");
   is(document.l10n.getAttributes(gLoginItem.shadowRoot.querySelector(".time-changed")).args.timeChanged, TEST_LOGIN_1.timePasswordChanged, "time-changed should be populated");
   is(document.l10n.getAttributes(gLoginItem.shadowRoot.querySelector(".time-used")).args.timeUsed, TEST_LOGIN_1.timeLastUsed, "time-used should be populated");
@@ -126,6 +126,7 @@
 
   usernameInput.placeholder = "dummy placeholder";
   gLoginItem.shadowRoot.querySelector(".edit-button").click();
+  await asyncElementRendered();
   is(
     document.l10n.getAttributes(usernameInput).id,
     null,
@@ -160,6 +161,7 @@
   usernameInput.placeholder = "dummy placeholder";
   gLoginItem.shadowRoot.querySelector(".edit-button").click();
   await asyncElementRendered();
+  await asyncElementRendered();
 
   ok(gLoginItem.dataset.editing, "loginItem should be in 'edit' mode");
   ok(isHidden(gLoginItem.shadowRoot.querySelector(".edit-button")), "edit button should be hidden in 'edit' mode");
@@ -199,6 +201,7 @@
 add_task(async function test_edit_login_cancel() {
   gLoginItem.setLogin(TEST_LOGIN_1);
   gLoginItem.shadowRoot.querySelector(".edit-button").click();
+  await asyncElementRendered();
 
   ok(gLoginItem.dataset.editing, "loginItem should be in 'edit' mode");
   is(!!gLoginItem.dataset.isNewLogin, false,
@@ -231,6 +234,8 @@
 
   let editButton = gLoginItem.shadowRoot.querySelector(".edit-button");
   editButton.click();
+  await asyncElementRendered();
+
   ok(revealCheckbox.checked, "reveal-checkbox should remain checked when entering 'edit' mode");
   gLoginItem.shadowRoot.querySelector(".cancel-button").click();
   ok(!revealCheckbox.checked, "reveal-checkbox should be unchecked after canceling 'edit' mode");
@@ -307,7 +312,7 @@
 
   is(gLoginItem.shadowRoot.querySelector("input[name='origin']").value, TEST_LOGIN_1.origin, "origin should be unchanged");
   is(gLoginItem.shadowRoot.querySelector("input[name='username']").value, TEST_LOGIN_1.username, "username should be unchanged");
-  is(gLoginItem.shadowRoot.querySelector("input[name='password']").value, TEST_LOGIN_1.password, "password should be unchanged");
+  is(gLoginItem.shadowRoot.querySelector("input[name='password']").value, " ".repeat(TEST_LOGIN_1.password.length), "password length should be unchanged");
   is(document.l10n.getAttributes(gLoginItem.shadowRoot.querySelector(".time-created")).args.timeCreated, TEST_LOGIN_1.timeCreated, "time-created should be unchanged");
   is(document.l10n.getAttributes(gLoginItem.shadowRoot.querySelector(".time-changed")).args.timeChanged, TEST_LOGIN_1.timePasswordChanged, "time-changed should be unchanged");
   is(document.l10n.getAttributes(gLoginItem.shadowRoot.querySelector(".time-used")).args.timeUsed, TEST_LOGIN_1.timeLastUsed, "time-used should be unchanged");
@@ -321,7 +326,7 @@
 
   is(gLoginItem.shadowRoot.querySelector("input[name='origin']").value, TEST_LOGIN_1.origin, "origin should be unchanged");
   is(gLoginItem.shadowRoot.querySelector("input[name='username']").value, TEST_LOGIN_1.username, "username should be unchanged");
-  is(gLoginItem.shadowRoot.querySelector("input[name='password']").value, TEST_LOGIN_1.password, "password should be unchanged");
+  is(gLoginItem.shadowRoot.querySelector("input[name='password']").value, " ".repeat(TEST_LOGIN_1.password.length), "password length should be unchanged");
   is(document.l10n.getAttributes(gLoginItem.shadowRoot.querySelector(".time-created")).args.timeCreated, TEST_LOGIN_1.timeCreated, "time-created should be unchanged");
   is(document.l10n.getAttributes(gLoginItem.shadowRoot.querySelector(".time-changed")).args.timeChanged, TEST_LOGIN_1.timePasswordChanged, "time-changed should be unchanged");
   is(document.l10n.getAttributes(gLoginItem.shadowRoot.querySelector(".time-used")).args.timeUsed, TEST_LOGIN_1.timeLastUsed, "time-used should be unchanged");
@@ -335,7 +340,7 @@
 
   is(gLoginItem.shadowRoot.querySelector("input[name='origin']").value, modifiedLogin.origin, "origin should be updated");
   is(gLoginItem.shadowRoot.querySelector("input[name='username']").value, modifiedLogin.username, "username should be updated");
-  is(gLoginItem.shadowRoot.querySelector("input[name='password']").value, modifiedLogin.password, "password should be updated");
+  is(gLoginItem.shadowRoot.querySelector("input[name='password']").value, " ".repeat(modifiedLogin.password.length), "password length should be updated");
   is(document.l10n.getAttributes(gLoginItem.shadowRoot.querySelector(".time-created")).args.timeCreated, modifiedLogin.timeCreated, "time-created should be updated");
   is(document.l10n.getAttributes(gLoginItem.shadowRoot.querySelector(".time-changed")).args.timeChanged, modifiedLogin.timePasswordChanged, "time-changed should be updated");
   is(document.l10n.getAttributes(gLoginItem.shadowRoot.querySelector(".time-used")).args.timeUsed, modifiedLogin.timeLastUsed, "time-used should be updated");

build/unix/elfhack/elfhack.cpp

@@ -194,7 +194,7 @@ class ElfRelHackCode_Section : public ElfSection {
 
   ~ElfRelHackCode_Section() { delete elf; }
 
-  void serialize(std::ofstream& file, char ei_class, char ei_data) {
+  void serialize(std::ofstream& file, char ei_class, char ei_data) override {
     // Readjust code offsets
     for (std::vector<ElfSection*>::iterator c = code.begin(); c != code.end();
          ++c)
@@ -217,7 +217,7 @@ class ElfRelHackCode_Section : public ElfSection {
     ElfSection::serialize(file, ei_class, ei_data);
   }
 
-  bool isRelocatable() { return false; }
+  bool isRelocatable() override { return false; }
 
   unsigned int getEntryPoint() { return entry_point; }
 

config/recurse.mk

@@ -203,7 +203,9 @@ $(addprefix build/unix/stdc++compat/,target host) build/clang-plugin/host: confi
 # export, which ensures it exists before recursing the rust targets, tricking
 # Make into keeping them early.
 $(rust_targets): $(DEPTH)/.cargo/config
+ifndef TEST_MOZBUILD
 export:: $(DEPTH)/.cargo/config
+endif
 
 # When building gtest as part of the build (LINK_GTEST_DURING_COMPILE),
 # force the build system to get to it first, so that it can be linked

devtools/client/debugger/src/utils/utils.js

@@ -5,7 +5,7 @@
 // @flow
 
 import type { SourceContent } from "../types";
-import { saveAs } from "devtools-modules";
+import { DevToolsUtils } from "devtools-modules";
 
 /**
  * Utils for utils, by utils
@@ -62,5 +62,5 @@ export function downloadFile(content: SourceContent, fileName: string) {
   }
 
   const data = new TextEncoder().encode(content.value);
-  saveAs(window, data, fileName);
+  DevToolsUtils.saveAs(window, data, fileName);
 }

devtools/client/shared/build/build-debugger.js

@@ -72,6 +72,7 @@ const moduleMapping = {
   asyncStoreHelper: "devtools/client/shared/async-store-helper",
   asyncStorage: "devtools/shared/async-storage",
   PluralForm: "devtools/shared/plural-form",
+  DevToolsUtils: "devtools/shared/DevToolsUtils",
 };
 
 /*