Add upstream bits necessary for iOS card unmask prompt.

components/autofill/ios/browser/resources/autofill_controller.js

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Installs Autofill management functions on the |__gCrWeb| object.
 //
 // It scans the DOM, extracting and storing forms and returns a JSON string
 // representing an array of objects, each of which represents an Autofill form
 // with information about a form to be filled and/or submitted and it can be
 // translated to struct FormData
-// (chromium/src/components/autofill/common/form_data.h) for further processing.
+// (chromium/src/components/autofill/core/common/form_data.h) for further
+// processing.
 
 /**
  * Namespace for this file. It depends on |__gCrWeb| having already been
  * injected.
  */
 __gCrWeb['autofill'] = {};
 
 /**
  * The maximum length allowed for form data.
  *
@@ skipping 69 matching lines @@
  * chromium/src/components/autofill/content/renderer/form_autofill_util.h
  */
 __gCrWeb.autofill.EXTRACT_MASK_OPTIONS = 1 << 2;
 
 /**
  * The last element that was autofilled.
  */
 __gCrWeb.autofill.lastAutoFilledElement = null;
 
 /**
+ * The last element that was active (used to restore focus if necessary).
+ */
+__gCrWeb.autofill.lastActiveElement = null;
+
+/**
  * Scans DOM and returns a JSON string representation of forms and form
  * extraction results.
  * @param {int} requiredFields The minimum number of fields forms must have to
  *     be extracted.
  * @param {int} requirements The requirements mask for forms, e.g. autocomplete
  *     attribute state.
  * @return {string} A JSON encoded object with object['forms'] containing the
  *     forms data and object['has_more_forms'] indicating if there are more
  *     forms to extract.
  */
 __gCrWeb.autofill['extractForms'] = function(requiredFields, requirements) {
   var forms = [];
   // Protect against custom implementation of Array.toJSON in host pages.
   forms.toJSON = null;
   // TODO(chenyu): check if any preparation is needed for information such as
   // user_submitted or the one added in core.js is sufficient.
   var hasMoreForms = __gCrWeb.autofill.extractFormsAndFormElements(
       window,
       requiredFields,
       requirements,
       forms);
   var results = new __gCrWeb.common.JSONSafeObject;
   results['has_more_forms'] = hasMoreForms;
   results['forms'] = forms;
   return __gCrWeb.stringify(results);
 };
 
 /**
- * Fills data into the active form field.
+ * Stores the current active element. This is used to make the element active
+ * again in case the web view loses focus when a dialog is presented over it.
+ */
+__gCrWeb.autofill['storeActiveElement'] = function() {

[Dan Beam, 2015/05/20 23:31:52]

why are you missing ['braces'] and .dot notation?  they do the same thing... but
.dotNotation is mildly better when .propName is a legal identifier.

are you worried about property renaming or something?

[Dan Beam, 2015/05/20 23:32:06]

s/missing/mixing

[Justin Donnelly, 2015/05/21 00:36:01]

I don't know, I'm pretty new to working with this code.

dconnelly, do you know the motivation for brace notation in the injected
javascript?

[dconnelly, 2015/05/21 07:27:54]

Yeah, it's some Closure compiler thing. The functions called from outside need
to be in the brace notation or they'll get squashed. You can look at some of the
other ios_internal JS code to see more.

+  __gCrWeb.autofill.lastActiveElement = document.activeElement;
+}
+
+/**
+ * Clears the current active element by setting it to null.
+ */
+__gCrWeb.autofill['clearActiveElement'] = function() {
+  __gCrWeb.autofill.lastActiveElement = null;
+}
+
+/**
+ * Fills data into the active form field. The active form field is either
+ * document.activeElement or the value of lastActiveElement if that value is
+ * non-null.
  *
  * @param {Object} data The data to fill in.
  */
 __gCrWeb.autofill['fillActiveFormField'] = function(data) {
   var activeElement = document.activeElement;
+  if (__gCrWeb.autofill.lastActiveElement) {
+    activeElement = __gCrWeb.autofill.lastActiveElement;
+    activeElement.focus();
+    __gCrWeb.autofill.lastActiveElement = null;
+  }
   if (data['name'] !== __gCrWeb['common'].nameForAutofill(activeElement)) {
     return;
   }
   __gCrWeb.autofill.lastAutoFilledElement = activeElement;
   __gCrWeb.autofill.fillFormField(data, activeElement);
 };
 
 /**
  * Fills a number of fields in the same named form.
  *
@@ skipping 1237 matching lines @@
         continue;
       }
       var elementName = __gCrWeb['common'].nameForAutofill(element);
       var value = formData[elementName];
       if (value) {
         element.placeholder = value;
       }
     }
   }
 };