Changeset 104864 in webkit

Timestamp:

Jan 12, 2012 2:57:14 PM (12 years ago)

Author:

jonlee@apple.com

Message:

Setting value on a select element to a non existing option value should clear selection
​https://bugs.webkit.org/show_bug.cgi?id=67233
<rdar://problem/10057159>

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/forms/select/setting-to-invalid-value.html

• html/HTMLSelectElement.cpp:

(WebCore::HTMLSelectElement::setValue): Clear the selection in the cases where we cannot
find an option with the specified value. The spec states to clear the selectedness of all
options first. To avoid calling setSelectedIndex() multiple times, we clear the selected
option(s) only when don't find the appropriate option.

Also, correct the sentence style of a comment.

LayoutTests:

New tests check to see that setting the value of a select element clears the
selection, even if the value is invalid, null, or undefined.

• fast/forms/select/setting-to-invalid-value-expected.txt: Added.
• fast/forms/select/setting-to-invalid-value.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/select/setting-to-invalid-value-expected.txt (added)
• LayoutTests/fast/forms/select/setting-to-invalid-value.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLSelectElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-12  Jon Lee  <jonlee@apple.com>
+
+        Setting value on a select element to a non existing option value should clear selection
+        https://bugs.webkit.org/show_bug.cgi?id=67233
+        <rdar://problem/10057159>
+
+        Reviewed by Darin Adler.
+
+        New tests check to see that setting the value of a select element clears the
+        selection, even if the value is invalid, null, or undefined.
+
+        * fast/forms/select/setting-to-invalid-value-expected.txt: Added.
+        * fast/forms/select/setting-to-invalid-value.html: Added.
+
 2012-01-12  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-12  Jon Lee  <jonlee@apple.com>
+
+        Setting value on a select element to a non existing option value should clear selection
+        https://bugs.webkit.org/show_bug.cgi?id=67233
+        <rdar://problem/10057159>
+
+        Reviewed by Darin Adler.
+
+        Test: fast/forms/select/setting-to-invalid-value.html
+
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::setValue): Clear the selection in the cases where we cannot
+        find an option with the specified value. The spec states to clear the selectedness of all
+        options first. To avoid calling setSelectedIndex() multiple times, we clear the selected
+        option(s) only when don't find the appropriate option.
+
+        Also, correct the sentence style of a comment.
+
 2012-01-12  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/html/HTMLSelectElement.cpp

@@ -248 +248 @@
 void HTMLSelectElement::setValue(const String &value)
 {
-    if (value.isNull())
+    // We clear the previously selected option(s) when needed, to guarantee calling setSelectedIndex() only once.
+    if (value.isNull()) {
+        setSelectedIndex(-1);
         return;
-    // find the option with value() matching the given parameter
-    // and make it the current selection.
+    }
+
+    // Find the option with value() matching the given parameter and make it the current selection.
     const Vector<HTMLElement*>& items = listItems();
     unsigned optionIndex = 0;
@@ -263 +266 @@
         }
     }
+
+    setSelectedIndex(-1);
 }