Changeset 25668 in webkit

Timestamp:

Sep 20, 2007, 1:52:09 AM (18 years ago)

Author:

rwlbuis

Message:

Reviewed by Mitz.

​http://bugs.webkit.org/show_bug.cgi?id=15235
Options can not be removed from a Select element with OptGroup's using JavaScript

Remove HTMLOptionElement children against the proper parent node.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/option-in-optgroup-removal-expected.txt (added)
• LayoutTests/fast/forms/option-in-optgroup-removal.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLSelectElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-09-20  Rob Buis  <buis@kde.org>
+
+        Reviewed by Mitz.
+
+        Testcase for:
+        http://bugs.webkit.org/show_bug.cgi?id=15235
+        Options can not be removed from a Select element with OptGroup's using JavaScript
+
+        * fast/forms/option-in-optgroup-removal-expected.txt: Added.
+        * fast/forms/option-in-optgroup-removal.html: Added.
+
 2007-09-19  Kevin McCullough  <kmccullough@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-09-20  Rob Buis  <buis@kde.org>
+
+        Reviewed by Mitz.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15235
+        Options can not be removed from a Select element with OptGroup's using JavaScript
+
+        Remove HTMLOptionElement children against the proper parent node.
+
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::remove):
+
 2007-09-19  John Sullivan  <sullivan@apple.com>
 

trunk/WebCore/html/HTMLSelectElement.cpp

@@ -237 +237 @@
         return; // ### what should we do ? remove the last item?
 
-    removeChild(items[listIndex], ec);
+    Element *item = items[listIndex];
+    ASSERT(item->parentNode());
+    item->parentNode()->removeChild(item, ec);
     if (!ec)
         setRecalcListItems();