Backed out 3 changesets (bug 1287202) for "e10s test-macosx64/debug-mochitest-e10s-5" failures CLOSED TREE

Backed out changeset 4b4f6ca7d624 (bug 1287202)
Backed out changeset e99bb6304a7a (bug 1287202)
Backed out changeset d10006d3c64a (bug 1287202)

toolkit/components/passwordmgr/LoginManagerContent.jsm

@@ -452,8 +452,6 @@ var LoginManagerContent = {
       return;
     }
 
-    this.setupProgressListener(topWindow);
-
     let pwField = event.originalTarget;
     if (pwField.form) {
       // Fill is handled by onDOMFormHasPassword which is already throttled.
@@ -473,6 +471,9 @@ var LoginManagerContent = {
 
   _processDOMInputPasswordAddedEvent(event, topWindow) {
     let pwField = event.originalTarget;
+    // Only setup the listener for formless inputs.
+    // Capture within a <form> but without a submit event is bug 1287202.
+    this.setupProgressListener(topWindow);
 
     let formLike = LoginFormFactory.createFromField(pwField);
     log(" _processDOMInputPasswordAddedEvent:", pwField, formLike);
@@ -993,6 +994,14 @@ var LoginManagerContent = {
         continue;
       }
 
+      if (ChromeUtils.getClassName(formRoot) === "HTMLFormElement") {
+        // For now only perform capture upon navigation for LoginForm's without
+        // a <form> to avoid capture from both a DOMFormBeforeSubmit event and
+        // navigation for the same "form".
+        log("Ignoring navigation for the form root to avoid multiple prompts " +
+            "since it was for a real <form>");
+        continue;
+      }
       let formLike = LoginFormFactory.getForRootElement(formRoot);
       this._onFormSubmit(formLike);
     }

toolkit/components/passwordmgr/test/mochitest/test_formless_submit_navigation.html

@@ -91,28 +91,9 @@ const TESTCASES = [
     oldPasswordFieldValue: "pass1",
   },
   {
-    // Since there are two FormLikes to auto-submit in this case we mark
-    // one FormLike's password fields with a magic "ignore-form-submission"
-    // value so we can just focus on the other form. We then repeat the testcase
-    // below with the other FormLike ignored.
     document: `<input value="user1">
-      <input type=password value="ignore-form-submission" form="form1">
+      <input type=password value="user2" form="form1">
       <input type=password value="pass1">
-      <form id="form1">
-        <input value="user3">
-        <input type=password value="ignore-form-submission">
-      </form>`,
-
-    hostname: DEFAULT_ORIGIN,
-    formSubmitURL: DEFAULT_ORIGIN,
-    usernameFieldValue: "user1",
-    newPasswordFieldValue: "pass1",
-    oldPasswordFieldValue: null,
-  },
-  { // Same as above but with the other form ignored.
-    document: `<input value="user1">
-      <input type=password value="pass2" form="form1">
-      <input type=password value="ignore-form-submission">
       <form id="form1">
         <input value="user3">
         <input type=password value="pass2">
@@ -120,8 +101,8 @@ const TESTCASES = [
 
     hostname: DEFAULT_ORIGIN,
     formSubmitURL: DEFAULT_ORIGIN,
-    usernameFieldValue: null,
-    newPasswordFieldValue: "pass2",
+    usernameFieldValue: "user1",
+    newPasswordFieldValue: "pass1",
     oldPasswordFieldValue: null,
   },
   {
@@ -139,19 +120,10 @@ const TESTCASES = [
   },
 ];
 
-/**
- * @param {Function} [aFilterFn = undefined] Function to filter out irrelevant submissions.
- * @return {Promise} resolving when a relevant form submission was processed.
- */
-function getSubmitMessage(aFilterFn = undefined) {
+function getSubmitMessage() {
   info("getSubmitMessage");
   return new Promise((resolve, reject) => {
     PWMGR_COMMON_PARENT.addMessageListener("formSubmissionProcessed", function processed(...args) {
-      if (aFilterFn && !aFilterFn(...args)) {
-        // This submission isn't the one we're waiting for.
-        return;
-      }
-
       info("got formSubmissionProcessed");
       PWMGR_COMMON_PARENT.removeMessageListener("formSubmissionProcessed", processed);
       resolve(...args);
@@ -159,64 +131,47 @@ function getSubmitMessage(aFilterFn = undefined) {
   });
 }
 
-function filterFormSubmissions(data) {
-  return data.newPasswordField.value != "ignore-form-submission";
-}
-
 add_task(async function test() {
   let loginFrame = document.getElementById("loginFrame");
 
   for (let tc of TESTCASES) {
     for (let scriptName of Object.keys(SCRIPTS)) {
-      for (let surroundDocumentWithForm of [false, true]) {
-        info("Starting testcase with script " + scriptName + " and " +
-             (surroundDocumentWithForm ? "a" : "no") + " form wrapper: " + JSON.stringify(tc));
+      info("Starting testcase with script " + scriptName + ": " + JSON.stringify(tc));
+      let loadedPromise = new Promise((resolve) => {
+        loginFrame.addEventListener("load", function() {
+          resolve();
+        }, {once: true});
+      });
+      loginFrame.src = DEFAULT_ORIGIN + "/tests/toolkit/components/passwordmgr/test/mochitest/blank.html";
+      await loadedPromise;
 
-        let loadedPromise = new Promise((resolve) => {
-          loginFrame.addEventListener("load", function() {
-            resolve();
-          }, {once: true});
-        });
-        loginFrame.src = DEFAULT_ORIGIN + "/tests/toolkit/components/passwordmgr/test/mochitest/blank.html";
-        await loadedPromise;
+      let frameDoc = SpecialPowers.wrap(loginFrame.contentWindow).document;
+      // eslint-disable-next-line no-unsanitized/property
+      frameDoc.documentElement.innerHTML = tc.document;
+      // Wait for the form to be processed before trying to submit.
+      await promiseFormsProcessed();
+      let processedPromise = getSubmitMessage();
+      info("Running " + scriptName + " script to cause a submission");
+      frameDoc.defaultView.eval(SCRIPTS[scriptName]);
 
-        let frameDoc = SpecialPowers.wrap(loginFrame.contentWindow).document;
-        let testDoc = tc.document;
-        if (surroundDocumentWithForm) {
-          if (testDoc.includes("<form")) {
-            info("Skipping surroundDocumentWithForm case since document already contains a <form>");
-            continue;
-          }
-          testDoc = "<form>" + testDoc + "</form>";
-        }
+      let submittedResult = await processedPromise;
 
-        // eslint-disable-next-line no-unsanitized/property
-        frameDoc.documentElement.innerHTML = testDoc;
-        // Wait for the form to be processed before trying to submit.
-        await promiseFormsProcessed();
-        let processedPromise = getSubmitMessage(filterFormSubmissions);
-        info("Running " + scriptName + " script to cause a submission");
-        frameDoc.defaultView.eval(SCRIPTS[scriptName]);
+      // Check data sent via PasswordManager:onFormSubmit
+      is(submittedResult.hostname, tc.hostname, "Check hostname");
+      is(submittedResult.formSubmitURL, tc.formSubmitURL, "Check formSubmitURL");
 
-        let submittedResult = await processedPromise;
+      if (tc.usernameFieldValue === null) {
+        is(submittedResult.usernameField, tc.usernameFieldValue, "Check usernameField");
+      } else {
+        is(submittedResult.usernameField.value, tc.usernameFieldValue, "Check usernameField");
+      }
 
-        // Check data sent via PasswordManager:onFormSubmit
-        is(submittedResult.hostname, tc.hostname, "Check hostname");
-        is(submittedResult.formSubmitURL, tc.formSubmitURL, "Check formSubmitURL");
+      is(submittedResult.newPasswordField.value, tc.newPasswordFieldValue, "Check newPasswordFieldValue");
 
-        if (tc.usernameFieldValue === null) {
-          is(submittedResult.usernameField, tc.usernameFieldValue, "Check usernameField");
-        } else {
-          is(submittedResult.usernameField.value, tc.usernameFieldValue, "Check usernameField");
-        }
-
-        is(submittedResult.newPasswordField.value, tc.newPasswordFieldValue, "Check newPasswordFieldValue");
-
-        if (tc.oldPasswordFieldValue === null) {
-          is(submittedResult.oldPasswordField, tc.oldPasswordFieldValue, "Check oldPasswordFieldValue");
-        } else {
-          is(submittedResult.oldPasswordField.value, tc.oldPasswordFieldValue, "Check oldPasswordFieldValue");
-        }
+      if (tc.oldPasswordFieldValue === null) {
+        is(submittedResult.oldPasswordField, tc.oldPasswordFieldValue, "Check oldPasswordFieldValue");
+      } else {
+        is(submittedResult.oldPasswordField.value, tc.oldPasswordFieldValue, "Check oldPasswordFieldValue");
       }
     }
   }

toolkit/components/passwordmgr/test/mochitest/test_formless_submit_navigation_negative.html

@@ -56,8 +56,8 @@ const SCRIPTS = {
 const TESTCASES = [
   // Begin test cases that shouldn't trigger capture.
   {
-    // Empty password field in a form
-    document: `<form><input type=password value=""></form>`,
+    // For now we don't trigger upon navigation if <form> is used.
+    document: `<form><input type=password value="pass1"></form>`,
   },
   {
     // Empty password field
@@ -69,12 +69,6 @@ const TESTCASES = [
     document: `<input type=password value="pass2">`,
     wouldCapture: true,
   },
-  {
-    // Test with an input that would normally be captured but with SCRIPTS that
-    // shouldn't trigger capture.
-    document: `<form><input type=password value="pass2"></form>`,
-    wouldCapture: true,
-  },
 ];
 
 add_task(async function test() {