Changeset 69651 in webkit

Timestamp:

Oct 13, 2010 5:27:51 AM (14 years ago)

Author:

yael.aharon@nokia.com

Message:

2010-10-13 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Andreas Kling.

Wrong ASSERT when select element has size 0
​https://bugs.webkit.org/show_bug.cgi?id=47567

• fast/dom/HTMLSelectElement/click-size-zero-no-crash-expected.txt: Added.
• fast/dom/HTMLSelectElement/click-size-zero-no-crash.html: Added.

2010-10-13 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Andreas Kling.

Wrong ASSERT when select element has size 0
​https://bugs.webkit.org/show_bug.cgi?id=47567

Keep the ASSERT only if the size of the element list is more than 0
Test: fast/dom/HTMLSelectElement/click-size-zero-no-crash.html

• dom/SelectElement.cpp: (WebCore::SelectElement::updateListBoxSelection): (WebCore::SelectElement::listBoxDefaultEventHandler):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/HTMLSelectElement/click-size-zero-no-crash-expected.txt (added)
• LayoutTests/fast/dom/HTMLSelectElement/click-size-zero-no-crash.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/SelectElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-13  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Wrong ASSERT when select element has size 0
+        https://bugs.webkit.org/show_bug.cgi?id=47567
+
+        * fast/dom/HTMLSelectElement/click-size-zero-no-crash-expected.txt: Added.
+        * fast/dom/HTMLSelectElement/click-size-zero-no-crash.html: Added.
+
 2010-10-13  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-13  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Wrong ASSERT when select element has size 0
+        https://bugs.webkit.org/show_bug.cgi?id=47567
+
+        Keep the ASSERT only if the size of the element list is more than 0
+        Test: fast/dom/HTMLSelectElement/click-size-zero-no-crash.html
+
+        * dom/SelectElement.cpp:
+        (WebCore::SelectElement::updateListBoxSelection):
+        (WebCore::SelectElement::listBoxDefaultEventHandler):
+
 2010-10-13  Steve Block  <steveblock@google.com>
 

trunk/WebCore/dom/SelectElement.cpp

@@ -153 +153 @@
 {
     ASSERT(element->renderer() && (element->renderer()->isListBox() || data.multiple()));
-    ASSERT(data.activeSelectionAnchorIndex() >= 0);
+    ASSERT(!data.listItems(element).size() || data.activeSelectionAnchorIndex() >= 0);
 
     unsigned start = min(data.activeSelectionAnchorIndex(), data.activeSelectionEndIndex());
@@ -753 +753 @@
             saveLastSelection(data, element);
 
-            ASSERT_UNUSED(listItems, endIndex >= 0 && (unsigned) endIndex < listItems.size());
+            ASSERT_UNUSED(listItems, !listItems.size() || (endIndex >= 0 && (unsigned) endIndex < listItems.size()));
             setActiveSelectionEndIndex(data, endIndex);