AutoFill: Fix two heuristic issues with nrm.org.

chrome/renderer/form_manager.cc

 // Copyright (c) 2010 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 "chrome/renderer/form_manager.h"
 
 #include "base/logging.h"
 #include "base/scoped_vector.h"
 #include "base/string_util.h"
 #include "base/stl_util-inl.h"
@@ skipping 90 matching lines @@
     return string16();
 
   if (previous.isTextNode()) {
     inferred_label = previous.nodeValue();
     TrimWhitespace(inferred_label, TRIM_ALL, &inferred_label);
   }
 
   // If we didn't find text, check for previous paragraph.
   // Eg. <p>Some Text</p><input ...>
   // Note the lack of whitespace between <p> and <input> elements.
-  if (inferred_label.empty()) {
-    if (previous.isElementNode()) {
-      WebElement element = previous.to<WebElement>();
-      if (element.hasTagName("p")) {
-        inferred_label = FindChildText(element);
-      }
+  if (inferred_label.empty() && previous.isElementNode()) {
+    WebElement element = previous.to<WebElement>();
+    if (element.hasTagName("p")) {
+      inferred_label = FindChildText(element);
     }
   }
 
   // If we didn't find paragraph, check for previous paragraph to this.
   // Eg. <p>Some Text</p>   <input ...>
   // Note the whitespace between <p> and <input> elements.
   if (inferred_label.empty()) {
-    previous = previous.previousSibling();
-    if (!previous.isNull() && previous.isElementNode()) {
-      WebElement element = previous.to<WebElement>();
+    WebNode sibling = previous.previousSibling();
+    if (!sibling.isNull() && sibling.isElementNode()) {
+      WebElement element = sibling.to<WebElement>();
       if (element.hasTagName("p")) {
         inferred_label = FindChildText(element);
       }
     }
   }
 
   // Look for text node prior to <img> tag.
   // Eg. Some Text<img/><input ...>
   if (inferred_label.empty()) {
     while (inferred_label.empty() && !previous.isNull()) {
@@ skipping 41 matching lines @@
 // Eg. <tr><td>Some Text</td><td><input ...></td></tr>
 // Eg. <tr><td><b>Some Text</b></td><td><b><input ...></b></td></tr>
 string16 InferLabelFromTable(
     const WebFormControlElement& element) {
   string16 inferred_label;
   WebNode parent = element.parentNode();
   while (!parent.isNull() && parent.isElementNode() &&
          !parent.to<WebElement>().hasTagName("td"))
     parent = parent.parentNode();
 
-  if (parent.isNull() || !parent.isElementNode())
-    return string16();
-
-  WebElement e = parent.to<WebElement>();
-  if (e.isNull() || !e.hasTagName("td"))
-    return string16();
-
   // Check all previous siblings, skipping non-element nodes, until we find a
   // non-empty text block.
-  WebNode previous = parent.previousSibling();
+  WebNode previous = parent;
   while (!previous.isNull()) {
     if (previous.isElementNode()) {
-      e = previous.to<WebElement>();
+      WebElement e = previous.to<WebElement>();
       if (e.hasTagName("td")) {
         inferred_label = FindChildText(e);
         if (!inferred_label.empty())
           break;
       }
     }
 
     previous = previous.previousSibling();
   }
 
@@ skipping 694 matching lines @@
   WebInputElement input_element = field->to<WebInputElement>();
 
   // If the maxlength attribute contains a negative value, maxLength()
   // returns the default maxlength value.
   input_element.setSuggestedValue(
       data->value().substr(0, input_element.maxLength()));
   input_element.setAutofilled(true);
   if (is_initiating_node)
     input_element.setSelectionRange(0, input_element.suggestedValue().length());
 }