diff options
3 files changed, 22 insertions, 50 deletions
diff --git a/chrome/renderer/autofill/form_manager.cc b/chrome/renderer/autofill/form_manager.cc index 82292be..4226ee0 100644 --- a/chrome/renderer/autofill/form_manager.cc +++ b/chrome/renderer/autofill/form_manager.cc @@ -237,9 +237,7 @@ string16 InferLabelFromPrevious(const WebFormControlElement& element) { // Helper for |InferLabelForElement()| that infers a label, if possible, from // surrounding table structure, // e.g. <tr><td>Some Text</td><td><input ...></td></tr> -// or <tr><th>Some Text</th><td><input ...></td></tr> // or <tr><td><b>Some Text</b></td><td><b><input ...></b></td></tr> -// or <tr><th><b>Some Text</b></th><td><b><input ...></b></td></tr> string16 InferLabelFromTable(const WebFormControlElement& element) { WebNode parent = element.parentNode(); while (!parent.isNull() && parent.isElementNode() && @@ -252,7 +250,7 @@ string16 InferLabelFromTable(const WebFormControlElement& element) { string16 inferred_label; WebNode previous = parent; while (inferred_label.empty() && !previous.isNull()) { - if (HasTagName(previous, "td") || HasTagName(previous, "th")) + if (HasTagName(previous, "td")) inferred_label = FindChildText(previous.to<WebElement>()); previous = previous.previousSibling(); diff --git a/chrome/renderer/autofill/form_manager_browsertest.cc b/chrome/renderer/autofill/form_manager_browsertest.cc index 86f04e5..b07959d 100644 --- a/chrome/renderer/autofill/form_manager_browsertest.cc +++ b/chrome/renderer/autofill/form_manager_browsertest.cc @@ -1094,32 +1094,6 @@ TEST_F(FormManagerTest, LabelsInferredFromTableCell) { "</FORM>"); } -TEST_F(FormManagerTest, LabelsInferredFromTableCellTH) { - ExpectJohnSmithLabels( - "<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">" - "<TABLE>" - " <TR>" - " <TH>First name:</TH>" - " <TD><INPUT type=\"text\" id=\"firstname\" value=\"John\"/></TD>" - " </TR>" - " <TR>" - " <TH>Last name:</TH>" - " <TD><INPUT type=\"text\" id=\"lastname\" value=\"Smith\"/></TD>" - " </TR>" - " <TR>" - " <TH>Email:</TH>" - " <TD><INPUT type=\"text\" id=\"email\"" - " value=\"john@example.com\"/></TD>" - " </TR>" - " <TR>" - " <TD></TD>" - " <TD>" - " <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>" - " </TD>" - " </TR>" - "</TABLE>" - "</FORM>"); -} TEST_F(FormManagerTest, LabelsInferredFromTableCellNested) { std::vector<string16> labels, names, values; diff --git a/chrome/test/data/autofill/heuristics/output/12_register_pyramidcollection.com.out b/chrome/test/data/autofill/heuristics/output/12_register_pyramidcollection.com.out index ea6c509..5a1e327 100644 --- a/chrome/test/data/autofill/heuristics/output/12_register_pyramidcollection.com.out +++ b/chrome/test/data/autofill/heuristics/output/12_register_pyramidcollection.com.out @@ -1,21 +1,21 @@ -EMAIL_ADDRESS -NAME_FIRST -NAME_LAST -ADDRESS_HOME_LINE1 -ADDRESS_HOME_LINE2 -ADDRESS_HOME_CITY -ADDRESS_HOME_STATE -ADDRESS_HOME_COUNTRY -ADDRESS_HOME_ZIP -PHONE_HOME_WHOLE_NUMBER -PHONE_HOME_WHOLE_NUMBER -NAME_FIRST -NAME_LAST -ADDRESS_HOME_LINE1 -ADDRESS_HOME_LINE2 -ADDRESS_HOME_CITY -ADDRESS_HOME_STATE -ADDRESS_HOME_COUNTRY -ADDRESS_HOME_ZIP -PHONE_HOME_WHOLE_NUMBER -PHONE_HOME_WHOLE_NUMBER +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE +UNKNOWN_TYPE |