Changeset 207276 in webkit

Timestamp:

Oct 12, 2016 9:13:49 PM (8 years ago)

Author:

Chris Dumez

Message:

Update HTMLSelectElement::recalcListItems() to ignore nested optgroup elements
​https://bugs.webkit.org/show_bug.cgi?id=163358

Reviewed by Kent Tamura.

Source/WebCore:

Update HTMLSelectElement::recalcListItems() to ignore nested optgroup elements.
As per the specification, we only want optgroup elements that are direct
children of the select element. This also matches the behavior of Chrome.

Test: fast/dom/HTMLSelectElement/nested-optgroup.html

• html/HTMLSelectElement.cpp:

(WebCore::HTMLSelectElement::recalcListItems):

LayoutTests:

Add layout test coverage.

• fast/dom/HTMLSelectElement/nested-optgroup-expected.txt: Added.
• fast/dom/HTMLSelectElement/nested-optgroup.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLSelectElement/nested-optgroup-expected.txt (added)
• LayoutTests/fast/dom/HTMLSelectElement/nested-optgroup.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLSelectElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-12  Chris Dumez  <cdumez@apple.com>
+
+        Update HTMLSelectElement::recalcListItems() to ignore nested optgroup elements
+        https://bugs.webkit.org/show_bug.cgi?id=163358
+
+        Reviewed by Kent Tamura.
+
+        Add layout test coverage.
+
+        * fast/dom/HTMLSelectElement/nested-optgroup-expected.txt: Added.
+        * fast/dom/HTMLSelectElement/nested-optgroup.html: Added.
+
 2016-10-12  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-12  Chris Dumez  <cdumez@apple.com>
+
+        Update HTMLSelectElement::recalcListItems() to ignore nested optgroup elements
+        https://bugs.webkit.org/show_bug.cgi?id=163358
+
+        Reviewed by Kent Tamura.
+
+        Update HTMLSelectElement::recalcListItems() to ignore nested optgroup elements.
+        As per the specification, we only want optgroup elements that are direct
+        children of the select element. This also matches the behavior of Chrome.
+
+        Test: fast/dom/HTMLSelectElement/nested-optgroup.html
+
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::recalcListItems):
+
 2016-10-12  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/html/HTMLSelectElement.cpp

@@ -771 +771 @@
         HTMLElement& current = downcast<HTMLElement>(*currentElement);
 
-        // optgroup tags may not nest. However, both FireFox and IE will
-        // flatten the tree automatically, so we follow suit.
-        // (http://www.w3.org/TR/html401/interact/forms.html#h-17.6)
-        if (is<HTMLOptGroupElement>(current)) {
+        // Only consider optgroup elements that are direct children of the select element.
+        if (is<HTMLOptGroupElement>(current) && current.parentNode() == this) {
             m_listItems.append(&current);
             if (Element* nextElement = ElementTraversal::firstWithin(current)) {