Revert of Turn off autofill highlight when changing option in an auto…

…filled <select> element (patchset #3 id:40001 of https://codereview.chromium.org/553983012/) Reason for revert: This makes the FormAutofillTest.ClearFormWithNodeContainingSelectOne browser_test fail. http://test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=FormAutofillTest.ClearFormWithNodeContainingSelectOne&testType=browser_tests Original issue's description: > Turn off autofill highlight when changing option in an autofilled <select> element > > [email protected], [email protected] > BUG=412311 > > Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=182528 [email protected],[email protected],[email protected] NOTREECHECKS=true NOTRY=true BUG=412311 Review URL: https://codereview.chromium.org/597853004 git-svn-id: svn://svn.chromium.org/blink/trunk@182569 bbb929c8-8fbe-4397-9dbb-9b2b20218538
yoavweiss · Sep 24, 2014 · 2dfcbe8 · 2dfcbe8
1 parent ebb1894
commit 2dfcbe8
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 32 deletions.
diff --git a/LayoutTests/fast/forms/autofilled-expected.txt b/LayoutTests/fast/forms/autofilled-expected.txt
@@ -1,5 +1,5 @@
 This tests that foreground and background colors properly change for autofilled inputs or select options. It can only be run using the test harness.
-           
+
 PASS successfullyParsed is true
 
 TEST COMPLETE
@@ -18,8 +18,6 @@ PASS foregroundOf(select1) is not originalForeground
 PASS backgroundOf(select1) is not originalBackground
 PASS foregroundOf(select2) is not originalForeground
 PASS backgroundOf(select2) is not originalBackground
-PASS foregroundOf(select3) is not originalForeground
-PASS backgroundOf(select3) is not originalBackground
 PASS select2.options.length is 3
 PASS select2.options.length is 2
 PASS foregroundOf(select2) is autofilledSelectForeground
@@ -37,6 +35,4 @@ PASS foregroundOf(select1) is originalForeground
 PASS backgroundOf(select1) is originalBackground
 PASS foregroundOf(select2) is originalForeground
 PASS backgroundOf(select2) is originalBackground
-PASS foregroundOf(select3) is originalForeground
-PASS backgroundOf(select3) is originalBackground
 
diff --git a/LayoutTests/fast/forms/autofilled.html b/LayoutTests/fast/forms/autofilled.html
@@ -30,7 +30,6 @@
     textarea2.value = 'autofilled is true';
     var select1 = document.getElementById('select1');
     select2 = document.getElementById('select2');
-    var select3 = document.getElementById('select3');
 
     shouldBe('foregroundOf(textarea1)', 'originalForeground');
     shouldBe('backgroundOf(textarea1)', 'originalBackground');
@@ -41,7 +40,6 @@
     window.internals.setAutofilled(textarea2, true);
     window.internals.setAutofilled(select1, true);
     window.internals.setAutofilled(select2, true);
-    window.internals.setAutofilled(select3, true);
 
     shouldBeEqualToString('search.value', 'Search value');
 
@@ -58,8 +56,6 @@
     shouldNotBe('backgroundOf(select1)', 'originalBackground');
     shouldNotBe('foregroundOf(select2)', 'originalForeground');
     shouldNotBe('backgroundOf(select2)', 'originalBackground');
-    shouldNotBe('foregroundOf(select3)', 'originalForeground');
-    shouldNotBe('backgroundOf(select3)', 'originalBackground');
 
     // Remove an unselected option from <select> element. This should not affect the background color for the autofilled <select> element.
     shouldBe('select2.options.length', '3');
@@ -92,9 +88,6 @@
     // Remove selected option for select2 element
     select2.removeChild(select2[select2.selectedIndex]);
 
-    // Change selected option for select3 element
-    select3.selectedIndex = 2;
-
     // Colors should be restored.
     shouldBe('foregroundOf(field)', 'originalForeground');
     shouldBe('backgroundOf(field)', 'originalBackground');
@@ -108,13 +101,11 @@
     shouldBe('backgroundOf(select1)', 'originalBackground');
     shouldBe('foregroundOf(select2)', 'originalForeground');
     shouldBe('backgroundOf(select2)', 'originalBackground');
-    shouldBe('foregroundOf(select3)', 'originalForeground');
-    shouldBe('backgroundOf(select3)', 'originalBackground');
 }
 </script>
 
 <style>
-#field, #search, #textarea1, #textarea2, #select1, #select2, #select3 {
+#field, #search, #textarea1, #textarea2, #select1, #select2 {
     color: #FFFFFF;
     background-color: #FFFFFF;
 }
@@ -133,11 +124,6 @@
             <option >2</option>
             <option>3</option>
         </select>
-        <select id="select3">
-            <option selected>1</option>
-            <option >2</option>
-            <option>3</option>
-        </select>
     </form>
     <div id="console"></div>
 </body>
diff --git a/LayoutTests/platform/mac/fast/forms/autofilled-expected.txt b/LayoutTests/platform/mac/fast/forms/autofilled-expected.txt
@@ -18,8 +18,6 @@ PASS foregroundOf(select1) is not originalForeground
 PASS backgroundOf(select1) is not originalBackground
 PASS foregroundOf(select2) is not originalForeground
 PASS backgroundOf(select2) is not originalBackground
-PASS foregroundOf(select3) is not originalForeground
-PASS backgroundOf(select3) is not originalBackground
 PASS select2.options.length is 3
 PASS select2.options.length is 2
 PASS foregroundOf(select2) is autofilledSelectForeground
@@ -37,6 +35,4 @@ PASS foregroundOf(select1) is originalForeground
 PASS backgroundOf(select1) is originalBackground
 PASS foregroundOf(select2) is originalForeground
 PASS backgroundOf(select2) is originalBackground
-PASS foregroundOf(select3) is originalForeground
-PASS backgroundOf(select3) is originalBackground
 
diff --git a/Source/core/html/HTMLSelectElement.cpp b/Source/core/html/HTMLSelectElement.cpp
@@ -82,7 +82,6 @@ HTMLSelectElement::HTMLSelectElement(Document& document, HTMLFormElement* form)
     , m_activeSelectionState(false)
     , m_shouldRecalcListItems(false)
     , m_suggestedIndex(-1)
-    , m_isAutofilledByPreview(false)
 {
 }
 
@@ -270,8 +269,6 @@ void HTMLSelectElement::setValue(const String &value, bool sendEvents)
 
     int previousSelectedIndex = selectedIndex();
     setSuggestedIndex(-1);
-    if (m_isAutofilledByPreview)
-        setAutofilled(false);
     setSelectedIndex(optionIndex);
 
     if (sendEvents && previousSelectedIndex != selectedIndex()) {
@@ -307,7 +304,6 @@ void HTMLSelectElement::setSuggestedValue(const String& value)
         if (isHTMLOptionElement(items[i])) {
             if (toHTMLOptionElement(items[i])->value() == value) {
                 setSuggestedIndex(optionIndex);
-                m_isAutofilledByPreview = true;
                 return;
             }
             optionIndex++;
@@ -928,9 +924,6 @@ void HTMLSelectElement::selectOption(int optionIndex, SelectOptionFlags flags)
     const WillBeHeapVector<RawPtrWillBeMember<HTMLElement> >& items = listItems();
     int listIndex = optionToListIndex(optionIndex);
 
-    if (selectedIndex() != optionIndex && this->isAutofilled())
-        setAutofilled(false);
-
     HTMLElement* element = 0;
     if (listIndex >= 0) {
         element = items[listIndex];

diff --git a/Source/core/html/HTMLSelectElement.h b/Source/core/html/HTMLSelectElement.h
@@ -228,7 +228,6 @@ class HTMLSelectElement FINAL : public HTMLFormControlElementWithState, public T
     bool m_activeSelectionState;
     mutable bool m_shouldRecalcListItems;
     int m_suggestedIndex;
-    bool m_isAutofilledByPreview;
 };
 
 } // namespace blink