Changeset 152330 in webkit

Timestamp:

Jul 2, 2013 5:20:03 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Change event should not be dispatched by clicking a scrollbar of select listbox
​https://bugs.webkit.org/show_bug.cgi?id=118019
<rdar://problem/14297760>

Patch by Ruth Fong <​ruth_fong@apple.com> on 2013-07-02
Reviewed by Dean Jackson.

Source/WebCore:

Test: fast/forms/select/listbox-click-on-scrollbar.html

Merge the following:
​http://src.chromium.org/viewvc/blink?view=revision&revision=151689
​https://chromium.googlesource.com/chromium/blink/+/492549b0fcaa58a85aa0797446b62985a263704f

Previously, a select element with the multiple attribute would dispatch
an onChanged event when the scrollbar is clicked. This patch corrects this
issue by only calling listBoxOnChange(), which fires the onChanged event,
when an actual option is clicked.

• html/HTMLSelectElement.cpp:

(WebCore::HTMLSelectElement::childrenChanged): Updated to clear the list
of selected items when when an <option> element is added to/deleted from its <select> element.
(Without this addition, if a option was selected, and then JavaScript was used to modify
the <select> element, and then the scrollbar was clicked, an onChanged event would fire
because it remembers the previously selected option.)

(WebCore::HTMLSelectElement::listBoxOnChange):

(WebCore::HTMLSelectElement::listBoxDefaultEventHandler): Updated to
only call listBoxOnChange() if at least one option is selected.

LayoutTests:

Merge the following:
​http://src.chromium.org/viewvc/blink?view=revision&revision=151689
​https://chromium.googlesource.com/chromium/blink/+/492549b0fcaa58a85aa0797446b62985a263704f

• fast/forms/select/listbox-click-on-scrollbar-expected.txt: Added.
• fast/forms/select/listbox-click-on-scrollbar.html: Added.

Tests that an onChange() event is not fired when the scrollbar of a
<select multiple> element is clicked.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/select/listbox-click-on-scrollbar-expected.txt (added)
• LayoutTests/fast/forms/select/listbox-click-on-scrollbar.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLSelectElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-07-02  Ruth Fong  <ruth_fong@apple.com>
+
+        Change event should not be dispatched by clicking a scrollbar of select listbox
+        https://bugs.webkit.org/show_bug.cgi?id=118019
+        <rdar://problem/14297760>
+
+        Reviewed by Dean Jackson.
+
+        Merge the following:
+        http://src.chromium.org/viewvc/blink?view=revision&revision=151689
+        https://chromium.googlesource.com/chromium/blink/+/492549b0fcaa58a85aa0797446b62985a263704f
+
+        * fast/forms/select/listbox-click-on-scrollbar-expected.txt: Added.
+        * fast/forms/select/listbox-click-on-scrollbar.html: Added.
+        Tests that an onChange() event is not fired when the scrollbar of a 
+        <select multiple> element is clicked.
+
 2013-07-02  David Farler  <dfarler@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-02  Ruth Fong  <ruth_fong@apple.com>
+
+        Change event should not be dispatched by clicking a scrollbar of select listbox
+        https://bugs.webkit.org/show_bug.cgi?id=118019
+        <rdar://problem/14297760>
+
+        Reviewed by Dean Jackson.
+
+        Test: fast/forms/select/listbox-click-on-scrollbar.html
+
+        Merge the following:
+        http://src.chromium.org/viewvc/blink?view=revision&revision=151689
+        https://chromium.googlesource.com/chromium/blink/+/492549b0fcaa58a85aa0797446b62985a263704f
+
+        Previously, a select element with the multiple attribute would dispatch
+        an onChanged event when the scrollbar is clicked. This patch corrects this
+        issue by only calling listBoxOnChange(), which fires the onChanged event, 
+        when an actual option is clicked.
+
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::childrenChanged): Updated to clear the list
+        of selected items when when an <option> element is added to/deleted from its <select> element.
+        (Without this addition, if a option was selected, and then JavaScript was used to modify 
+        the <select> element, and then the scrollbar was clicked, an onChanged event would fire 
+        because it remembers the previously selected option.)
+
+        (WebCore::HTMLSelectElement::listBoxOnChange):
+
+        (WebCore::HTMLSelectElement::listBoxDefaultEventHandler): Updated to
+        only call listBoxOnChange() if at least one option is selected. 
+
 2013-07-02  Alex Christensen  <achristensen@apple.com>
 

trunk/Source/WebCore/html/HTMLSelectElement.cpp

@@ -375 +375 @@
     setRecalcListItems();
     setNeedsValidityCheck();
+    m_lastOnChangeSelection.clear();
 
     HTMLFormControlElementWithState::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
@@ -1348 +1349 @@
         }
     } else if (event->type() == eventNames().mouseupEvent && event->isMouseEvent() && static_cast<MouseEvent*>(event)->button() == LeftButton && document()->frame()->eventHandler()->autoscrollRenderer() != renderer()) {
+        // This click or drag event was not over any of the options.
+        if (m_lastOnChangeSelection.isEmpty())
+            return;
         // This makes sure we fire dispatchFormControlChangeEvent for a single
         // click. For drag selection, onChange will fire when the autoscroll