diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-03 04:29:57 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-03 04:29:57 +0000 |
| commit | d69754f2b9b45a586657e0672ae20c1eb1e8b6e5 (patch) | |
| tree | adb093c3e202108d8b1c43fe91896b84c8adf8a4 /chrome | |
| parent | a477963978c74bbe743610c72b3cf290baaeb0bd (diff) | |
| download | chromium_src-d69754f2b9b45a586657e0672ae20c1eb1e8b6e5.zip chromium_src-d69754f2b9b45a586657e0672ae20c1eb1e8b6e5.tar.gz chromium_src-d69754f2b9b45a586657e0672ae20c1eb1e8b6e5.tar.bz2 | |
Reland r43564 with tests disabled.
Attempt to fix the perf regression: remove the code that calls LabelForElement.
TBR=dhollowa
BUG=40306
TEST=none
Review URL: http://codereview.chromium.org/1597005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/renderer/form_manager.cc | 4 | ||||
| -rw-r--r-- | chrome/renderer/form_manager_unittest.cc | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/chrome/renderer/form_manager.cc b/chrome/renderer/form_manager.cc index 7c3fa73..7063e97 100644 --- a/chrome/renderer/form_manager.cc +++ b/chrome/renderer/form_manager.cc @@ -58,7 +58,9 @@ void FormManager::WebFormControlElementToFormField( const WebFormControlElement& element, FormField* field) { DCHECK(field); - field->set_label(LabelForElement(element)); + // TODO(jhawkins): LabelForElement. Returning an empty label temporarily to + // diagnose a perf issue. + field->set_label(string16()); field->set_name(element.nameForAutofill()); field->set_form_control_type(element.formControlType()); diff --git a/chrome/renderer/form_manager_unittest.cc b/chrome/renderer/form_manager_unittest.cc index 256f58f..feda04d 100644 --- a/chrome/renderer/form_manager_unittest.cc +++ b/chrome/renderer/form_manager_unittest.cc @@ -377,7 +377,8 @@ TEST_F(FormManagerTest, Reset) { ASSERT_EQ(0U, forms.size()); } -TEST_F(FormManagerTest, Labels) { +// http://crbug.com/40306 +TEST_F(FormManagerTest, DISABLED_Labels) { LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">" " <LABEL for=\"firstname\"> First name: </LABEL>" " <INPUT type=\"text\" id=\"firstname\" value=\"John\"/>" @@ -420,7 +421,8 @@ TEST_F(FormManagerTest, Labels) { fields[2]); } -TEST_F(FormManagerTest, LabelsInferredFromText) { +// http://crbug.com/40306 +TEST_F(FormManagerTest, DISABLED_LabelsInferredFromText) { LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">" " First name:" " <INPUT type=\"text\" id=\"firstname\" value=\"John\"/>" @@ -463,7 +465,8 @@ TEST_F(FormManagerTest, LabelsInferredFromText) { fields[2]); } -TEST_F(FormManagerTest, LabelsInferredFromParagraph) { +// http://crbug.com/40306 +TEST_F(FormManagerTest, DISABLED_LabelsInferredFromParagraph) { LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">" " <P>First name:</P><INPUT type=\"text\" " " id=\"firstname\" value=\"John\"/>" @@ -506,7 +509,8 @@ TEST_F(FormManagerTest, LabelsInferredFromParagraph) { fields[2]); } -TEST_F(FormManagerTest, LabelsInferredFromTableCell) { +// http://crbug.com/40306 +TEST_F(FormManagerTest, DISABLED_LabelsInferredFromTableCell) { LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">" "<TABLE>" " <TR>" |