Backed out changeset da12ceebe125 (bug 1300996)

browser/extensions/formautofill/FormAutofillHandler.jsm

@@ -29,8 +29,6 @@ FormAutofillUtils.defineLazyLogGetter(this, this.EXPORTED_SYMBOLS[0]);
 function FormAutofillHandler(form) {
   this.form = form;
   this.fieldDetails = [];
-  this.winUtils = this.form.rootElement.ownerGlobal.QueryInterface(Ci.nsIInterfaceRequestor)
-    .getInterface(Ci.nsIDOMWindowUtils);
 }
 
 FormAutofillHandler.prototype = {
@@ -59,23 +57,6 @@ FormAutofillHandler.prototype = {
    */
   filledProfileGUID: null,
 
-  /**
-   * A WindowUtils reference of which Window the form belongs
-   */
-  winUtils: null,
-
-  /**
-   * Enum for form autofill MANUALLY_MANAGED_STATES values
-   */
-  fieldStateEnum: {
-    // not themed
-    NORMAL: null,
-    // highlighted
-    AUTO_FILLED: "-moz-autofill",
-    // highlighted && grey color text
-    PREVIEW: "-moz-autofill-preview",
-  },
-
   /**
    * Set fieldDetails from the form about fields that can be autofilled.
    */
@@ -106,16 +87,16 @@ FormAutofillHandler.prototype = {
       // 4. value already chosen in select element
 
       let element = fieldDetail.elementWeakRef.get();
-      if (!element) {
+      if (!element || element === focusedInput) {
         continue;
       }
 
       let value = profile[fieldDetail.fieldName];
-      if (element instanceof Ci.nsIDOMHTMLInputElement && !element.value && value) {
-        if (element !== focusedInput) {
-          element.setUserInput(value);
+      if (element instanceof Ci.nsIDOMHTMLInputElement && value) {
+        if (element.value) {
+          continue;
         }
-        this.changeFieldState(fieldDetail, "AUTO_FILLED");
+        element.setUserInput(value);
       } else if (element instanceof Ci.nsIDOMHTMLSelectElement) {
         for (let option of element.options) {
           if (value === option.textContent || value === option.value) {
@@ -129,12 +110,10 @@ FormAutofillHandler.prototype = {
             option.selected = true;
             element.dispatchEvent(new Event("input", {"bubbles": true}));
             element.dispatchEvent(new Event("change", {"bubbles": true}));
-            this.changeFieldState(fieldDetail, "AUTO_FILLED");
             break;
           }
         }
       }
-      element.previewValue = "";
     }
   },
 
@@ -146,81 +125,33 @@ FormAutofillHandler.prototype = {
    */
   previewFormFields(profile) {
     log.debug("preview profile in autofillFormFields:", profile);
-
+    /*
     for (let fieldDetail of this.fieldDetails) {
-      let element = fieldDetail.elementWeakRef.get();
       let value = profile[fieldDetail.fieldName] || "";
 
-      // Skip the field that is null or already has text entered
-      if (!element || element.value) {
+      // Skip the fields that already has text entered
+      if (fieldDetail.element.value) {
         continue;
       }
 
-      element.previewValue = value;
-      this.changeFieldState(fieldDetail, value ? "PREVIEW" : "NORMAL");
+      // TODO: Set highlight style and preview text.
     }
+    */
   },
 
-  /**
-   * Clear preview text and background highlight of all fields.
-   */
   clearPreviewedFormFields() {
     log.debug("clear previewed fields in:", this.form);
-
+    /*
     for (let fieldDetail of this.fieldDetails) {
-      let element = fieldDetail.elementWeakRef.get();
-      if (!element) {
-        log.warn(fieldDetail.fieldName, "is unreachable");
-        continue;
-      }
+      // TODO: Clear preview text
 
-      element.previewValue = "";
-
-      // We keep the state if this field has
-      // already been auto-filled.
-      if (fieldDetail.state === "AUTO_FILLED") {
-        continue;
-      }
-
-      this.changeFieldState(fieldDetail, "NORMAL");
-    }
-  },
-
-  /**
-   * Change the state of a field to correspond with different presentations.
-   *
-   * @param {Object} fieldDetail
-   *        A fieldDetail of which its element is about to update the state.
-   * @param {string} nextState
-   *        Used to determine the next state
-   */
-  changeFieldState(fieldDetail, nextState) {
-    let element = fieldDetail.elementWeakRef.get();
-
-    if (!element) {
-      log.warn(fieldDetail.fieldName, "is unreachable while changing state");
-      return;
-    }
-    if (!(nextState in this.fieldStateEnum)) {
-      log.warn(fieldDetail.fieldName, "is trying to change to an invalid state");
-      return;
-    }
-
-    for (let [state, mmStateValue] of Object.entries(this.fieldStateEnum)) {
-      // The NORMAL state is simply the absence of other manually
-      // managed states so we never need to add or remove it.
-      if (!mmStateValue) {
-        continue;
-      }
-
-      if (state == nextState) {
-        this.winUtils.addManuallyManagedState(element, mmStateValue);
-      } else {
-        this.winUtils.removeManuallyManagedState(element, mmStateValue);
+      // We keep the highlight of all fields if this form has
+      // already been auto-filled with a profile.
+      if (this.filledProfileGUID == null) {
+        // TODO: Remove highlight style
       }
     }
-
-    fieldDetail.state = nextState;
+    */
   },
 
   /**

browser/extensions/formautofill/skin/shared/autocomplete-item.css

@@ -35,7 +35,6 @@ xul|richlistitem[originaltype="autofill-profile"][selected="true"] > .profile-it
   flex-direction: row;
   flex-wrap: wrap;
   align-items: center;
-  background-color: #FFFFFF;
   color: -moz-FieldText
 }