Regression: r170111 Tapping listbox items should fire change/input event

BUG=403184 Review URL: https://codereview.chromium.org/486583002 git-svn-id: svn://svn.chromium.org/blink/trunk@180436 bbb929c8-8fbe-4397-9dbb-9b2b20218538

Regression: r170111 Tapping listbox items should fire change/input event
BUG=403184 Review URL: https://codereview.chromium.org/486583002 git-svn-id: svn://svn.chromium.org/blink/trunk@180436 bbb929c8-8fbe-4397-9dbb-9b2b20218538
cc5aa3e2 · keishi@chromium.org · 93263ae7 · cc5aa3e2 · cc5aa3e2 · cc5aa3e2
Commit cc5aa3e2 authored Aug 18, 2014 by keishi@chromium.org
3 changed files
--- a/third_party/WebKit/LayoutTests/fast/forms/select/listbox-tap-input-change-event-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/forms/select/listbox-tap-input-change-event-expected.txt
+Tapping on listbox items should fire an input and a change event.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS changeEventCounter is 0
+PASS inputEventCounter is 0
+PASS changeEventCounter is 1
+PASS inputEventCounter is 1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
--- a/third_party/WebKit/LayoutTests/fast/forms/select/listbox-tap-input-change-event.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/select/listbox-tap-input-change-event.html
+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../../resources/js-test.js"></script>
+<select id="select1" multiple size="4">
+<option>1</option>
+<option>2</option>
+<option>3</option>
+</select>
+
+<script>
+description('Tapping on listbox items should fire an input and a change event.');
+
+function tapOption(select, index) {
+    var itemHeight = Math.floor(select.offsetHeight / select.size);
+    var border = 1;
+    var y = border + index * itemHeight;
+
+    select.focus();
+    if (window.eventSender) {
+        eventSender.gestureTap(select.offsetLeft + border, select.offsetTop + y - window.pageYOffset + itemHeight / 2);
+    }
+}
+
+var select = document.getElementById('select1');
+var changeEventCounter = 0;
+var inputEventCounter = 0;
+
+select.addEventListener('change', function () {
+    changeEventCounter++;
+}, false);
+
+select.addEventListener('input', function () {
+    inputEventCounter++;
+}, false);
+
+if (window.eventSender) {
+    shouldBe('changeEventCounter', '0');
+    shouldBe('inputEventCounter', '0');
+    tapOption(select, 0);
+    shouldBe('changeEventCounter', '1');
+    shouldBe('inputEventCounter', '1');
+}
+</script>
+
+</html>
--- a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
@@ -1407,8 +1407,10 @@ void HTMLSelectElement::listBoxDefaultEventHandler(Event* event)
        GestureEvent& gestureEvent = toGestureEvent(*event);
        int listIndex = listIndexForEventTargetOption(gestureEvent);
        if (listIndex >= 0) {
-            if (!isDisabledFormControl())
+            if (!isDisabledFormControl()) {
                updateSelectedState(listIndex, true, gestureEvent.shiftKey());
+                listBoxOnChange();
+            }
            event->setDefaultHandled();
        }
    } else if (event->type() == EventTypeNames::mousedown && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) {