Changeset 139038 in webkit

Timestamp:

Jan 7, 2013 11:49:21 PM (11 years ago)

Author:

tkent@chromium.org

Message:

REGRESSION(r137406): Text inside an empty optgroup prevents subsequent options from appearing
​https://bugs.webkit.org/show_bug.cgi?id=106298

Reviewed by Ryosuke Niwa.

Source/WebCore:

Test: fast/forms/select/select-empty-optgroup.html

• html/HTMLSelectElement.cpp:

(WebCore::HTMLSelectElement::recalcListItems):
Traverse to the first element within the 'current' only if it exists.

LayoutTests:

• fast/forms/select/select-empty-optgroup-expected.html: Added.
• fast/forms/select/select-empty-optgroup.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/select/select-empty-optgroup-expected.html (added)
• LayoutTests/fast/forms/select/select-empty-optgroup.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLSelectElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-07  Kent Tamura  <tkent@chromium.org>
+
+        REGRESSION(r137406): Text inside an empty optgroup prevents subsequent options from appearing
+        https://bugs.webkit.org/show_bug.cgi?id=106298
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/forms/select/select-empty-optgroup-expected.html: Added.
+        * fast/forms/select/select-empty-optgroup.html: Added.
+
 2013-01-07  Kunihiko Sakamoto  <ksakamoto@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-07  Kent Tamura  <tkent@chromium.org>
+
+        REGRESSION(r137406): Text inside an empty optgroup prevents subsequent options from appearing
+        https://bugs.webkit.org/show_bug.cgi?id=106298
+
+        Reviewed by Ryosuke Niwa.
+
+        Test: fast/forms/select/select-empty-optgroup.html
+
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::recalcListItems):
+        Traverse to the first element within the 'current' only if it exists.
+
 2013-01-07  Steve Block  <steveblock@chromium.org>
 

trunk/Source/WebCore/html/HTMLSelectElement.cpp

@@ -748 +748 @@
         if (current->hasTagName(optgroupTag)) {
             m_listItems.append(current);
-            if (current->firstChild()) {
-                currentElement = ElementTraversal::firstWithin(current);
+            if (Element* nextElement = ElementTraversal::firstWithin(current)) {
+                currentElement = nextElement;
                 continue;
             }