Changeset 46806 in webkit

Timestamp:

Aug 5, 2009 11:38:56 AM (15 years ago)

Author:

abarth@webkit.org

Message:

2009-08-05 Szabo Carol <​carol.szabo@nokia.com>

Reviewed by Darin Adler.

Test for ​https://bugs.webkit.org/show_bug.cgi?id=27942
Form Reset does not work per w3c standard when single selection
SELECT element has more than one option marked as selected.

• fast/forms/select-reset-multiple-selections-4-single-selection-expected.txt: Added.
• fast/forms/select-reset-multiple-selections-4-single-selection.html: Added.

2009-08-05 Szabo Carol <​carol.szabo@nokia.com>

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=27942

Test: fast/forms/select-reset-multiple-selections-4-single-selection.html

• dom/SelectElement.cpp: (WebCore::SelectElement::reset):

Added HTML 4.01 compliant handling of broken webpages that
specify more than one selected option for single selection SELECT
element, in a manner that emulates Firefox and is similar to IE 7

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection-expected.txt (added)
• LayoutTests/fast/forms/select-reset-multiple-selections-4-single-selection.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/SelectElement.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-08-05  Szabo Carol  <carol.szabo@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=27942
+        Form Reset does not work per w3c standard when single selection
+        SELECT element has more than one option marked as selected.
+
+        * fast/forms/select-reset-multiple-selections-4-single-selection-expected.txt: Added.
+        * fast/forms/select-reset-multiple-selections-4-single-selection.html: Added.
+
 2009-08-04  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-05  Szabo Carol  <carol.szabo@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27942
+
+        Test: fast/forms/select-reset-multiple-selections-4-single-selection.html
+
+        * dom/SelectElement.cpp:
+        (WebCore::SelectElement::reset):
+           Added HTML 4.01 compliant handling of broken webpages that
+           specify more than one selected option for single selection SELECT
+           element, in a manner that emulates Firefox and is similar to IE 7
+
+
 2009-08-05  Andras Becsi  <becsi.andras@stud.u-szeged.hu>
 

trunk/WebCore/dom/SelectElement.cpp

@@ -493 +493 @@
 void SelectElement::reset(SelectElementData& data, Element* element)
 {
-    bool optionSelected = false;
     OptionElement* firstOption = 0;
+    OptionElement* selectedOption = 0;
 
     const Vector<Element*>& items = data.listItems(element);
@@ -503 +503 @@
 
         if (!items[i]->getAttribute(HTMLNames::selectedAttr).isNull()) {
+            if (selectedOption && !data.multiple())
+                selectedOption->setSelectedState(false);
             optionElement->setSelectedState(true);
-            optionSelected = true;
+            selectedOption = optionElement;
         } else
             optionElement->setSelectedState(false);
@@ -512 +514 @@
     }
 
-    if (!optionSelected && firstOption && data.usesMenuList())
+    if (!selectedOption && firstOption && data.usesMenuList())
         firstOption->setSelectedState(true);