Fix for autofill bug 8627

webkit/glue/dom_operations.cc

 // Copyright (c) 2006-2008 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.
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "AnimationController.h"
@@ skipping 294 matching lines @@
     it->second->onChange();
   }
 
   if (submit && submit_found) {
     fe->form_element->submit();
     return true;
   }
   return false;
 }
 
-// Helper function to cast a Node as an HTMLInputElement.
-static WebCore::HTMLInputElement* GetNodeAsInputElement(WebCore::Node* node) {
-  DCHECK(node->nodeType() == WebCore::Node::ELEMENT_NODE);
-  DCHECK(static_cast<WebCore::Element*>(node)->hasTagName(
-      WebCore::HTMLNames::inputTag));
-  return static_cast<WebCore::HTMLInputElement*>(node);
-}
-
 // Helper to search the given form element for the specified input elements
 // in |data|, and add results to |result|.
 static bool FindFormInputElements(WebCore::HTMLFormElement* fe,
                                   const FormData& data,
                                   FormElements* result) {
   Vector<RefPtr<WebCore::Node> > temp_elements;
   // Loop through the list of elements we need to find on the form in
   // order to autofill it. If we don't find any one of them, abort
   // processing this form; it can't be the right one.
   for (size_t j = 0; j < data.elements.size(); j++, temp_elements.clear()) {
     fe->getNamedElements(StdWStringToString(data.elements[j]),
                                             temp_elements);
     if (temp_elements.isEmpty()) {
       // We didn't find a required element. This is not the right form.
       // Make sure no input elements from a partially matched form
       // in this iteration remain in the result set.
       // Note: clear will remove a reference from each InputElement.
       result->input_elements.clear();
       return false;
     }
     // This element matched, add it to our temporary result. It's possible
     // there are multiple matches, but for purposes of identifying the form
     // one suffices and if some function needs to deal with multiple
     // matching elements it can get at them through the FormElement*.
     // Note: This assignment adds a reference to the InputElement.
     result->input_elements[data.elements[j]] =
-        GetNodeAsInputElement(temp_elements[0].get());
+        NodeToHTMLInputElement(temp_elements[0].get());
+    DCHECK(result->input_elements[data.elements[j]].get());
   }
   return true;
 }
 
 // Helper to locate form elements identified by |data|.
 static void FindFormElements(WebView* view,
                              const FormData& data,
                              FormElementsList* results) {
   DCHECK(view);
   DCHECK(results);
@@ skipping 507 matching lines @@
     return -1;
 
   WebCore::Frame* frame = static_cast<WebFrameImpl*>(web_frame)->frame();
   WebCore::AnimationController* controller = frame->animation();
   if (!controller)
     return -1;
 
   return controller->numberOfActiveAnimations();
 }
 
+WebCore::HTMLInputElement* ElementToHTMLInputElement(
+    WebCore::Element* element) {
+  if (!element->hasLocalName(WebCore::HTMLNames::inputTag))
+    return NULL;
+  return static_cast<WebCore::HTMLInputElement*>(element);
+}
+
+WebCore::HTMLInputElement* NodeToHTMLInputElement(WebCore::Node* node) {
+  if (node->nodeType() != WebCore::Node::ELEMENT_NODE)
+    return NULL;
+  return ElementToHTMLInputElement(static_cast<WebCore::Element*>(node));
+}
+
 } // webkit_glue