Changeset 108228 in webkit

Timestamp:

Feb 20, 2012 2:47:55 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Forms] Spin buttons of number input type should fire both input and change event
​https://bugs.webkit.org/show_bug.cgi?id=75067

Patch by Yosifumi Inoue <​yosin@chromium.org> on 2012-02-20
Reviewed by Kent Tamura.

Source/WebCore:

This patch makes spin button in number input field clicks to fire input and change events as described in WHATWG HTML5 specification.
To implement this behavior, this patch introduces new value DispatchInputAndChangeEvent in TextFieldEventBehavior.

Test: fast/forms/number/spin-button-events.html

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::stepUpFromRenderer): Pass DispatchInputAndChangeEvent instead of DispatchChangeEvent to applyStep, setValue, and setValueAsNumber.

• html/HTMLTextFormControlElement.h: Add new enum value DispatchInputAndChangeEvent to TextFieldEventBehavior.
• html/TextFieldInputType.cpp:

(WebCore::TextFieldInputType::setValue): Handle DispatchInputAndChangeEvent and use RefPtr for element to keep reference.

LayoutTests:

• fast/forms/number/spin-button-events-expected.txt: Added.
• fast/forms/number/spin-button-events.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/number/spin-button-events-expected.txt (added)
• LayoutTests/fast/forms/number/spin-button-events.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLInputElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLTextFormControlElement.h (modified) (1 diff)
• Source/WebCore/html/TextFieldInputType.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-20  Yosifumi Inoue  <yosin@chromium.org>
+
+        [Forms] Spin buttons of number input type should fire both input and change event
+        https://bugs.webkit.org/show_bug.cgi?id=75067
+
+        Reviewed by Kent Tamura.
+
+        * fast/forms/number/spin-button-events-expected.txt: Added.
+        * fast/forms/number/spin-button-events.html: Added.
+
 2012-02-20  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-20  Yosifumi Inoue  <yosin@chromium.org>
+
+        [Forms] Spin buttons of number input type should fire both input and change event
+        https://bugs.webkit.org/show_bug.cgi?id=75067
+
+        Reviewed by Kent Tamura.
+
+        This patch makes spin button in number input field clicks to fire input and change events as described in WHATWG HTML5 specification.
+        To implement this behavior, this patch introduces new value DispatchInputAndChangeEvent in TextFieldEventBehavior.
+
+        Test: fast/forms/number/spin-button-events.html
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::stepUpFromRenderer): Pass DispatchInputAndChangeEvent instead of DispatchChangeEvent to applyStep, setValue, and setValueAsNumber.
+        * html/HTMLTextFormControlElement.h: Add new enum value DispatchInputAndChangeEvent to TextFieldEventBehavior.
+        * html/TextFieldInputType.cpp:
+        (WebCore::TextFieldInputType::setValue): Handle DispatchInputAndChangeEvent and use RefPtr for element to keep reference.
+
 2012-02-20  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -1637 +1637 @@
         if (current > m_inputType->maximum() - nextDiff)
             current = m_inputType->maximum() - nextDiff;
-        setValueAsNumber(current, ec, DispatchChangeEvent);
+        setValueAsNumber(current, ec, DispatchInputAndChangeEvent);
     }
     if ((sign > 0 && current < m_inputType->minimum()) || (sign < 0 && current > m_inputType->maximum()))
-        setValue(m_inputType->serialize(sign > 0 ? m_inputType->minimum() : m_inputType->maximum()), DispatchChangeEvent);
+        setValue(m_inputType->serialize(sign > 0 ? m_inputType->minimum() : m_inputType->maximum()), DispatchInputAndChangeEvent);
     else {
         ExceptionCode ec;
@@ -1660 +1660 @@
                 newValue = m_inputType->maximum();
 
-            setValueAsNumber(newValue, ec, n == 1 || n == -1 ? DispatchChangeEvent : DispatchNoEvent);
+            setValueAsNumber(newValue, ec, n == 1 || n == -1 ? DispatchInputAndChangeEvent : DispatchNoEvent);
             current = newValue;
             if (n > 1)
-                applyStep(n - 1, AnyIsDefaultStep, DispatchChangeEvent, ec);
+                applyStep(n - 1, AnyIsDefaultStep, DispatchInputAndChangeEvent, ec);
             else if (n < -1)
-                applyStep(n + 1, AnyIsDefaultStep, DispatchChangeEvent, ec);
+                applyStep(n + 1, AnyIsDefaultStep, DispatchInputAndChangeEvent, ec);
         } else
-            applyStep(n, AnyIsDefaultStep, DispatchChangeEvent, ec);
+            applyStep(n, AnyIsDefaultStep, DispatchInputAndChangeEvent, ec);
     }
 }

trunk/Source/WebCore/html/HTMLTextFormControlElement.h

@@ -35 +35 @@
 
 enum TextFieldSelectionDirection { SelectionHasNoDirection, SelectionHasForwardDirection, SelectionHasBackwardDirection };
-enum TextFieldEventBehavior { DispatchNoEvent, DispatchChangeEvent };
+enum TextFieldEventBehavior { DispatchNoEvent, DispatchChangeEvent, DispatchInputAndChangeEvent };
 
 class HTMLTextFormControlElement : public HTMLFormControlElementWithState {

trunk/Source/WebCore/html/TextFieldInputType.cpp

@@ -81 +81 @@
 void TextFieldInputType::setValue(const String& sanitizedValue, bool valueChanged, TextFieldEventBehavior eventBehavior)
 {
+    // Grab this input element to keep reference even if JS event handler
+    // changes input type.
+    RefPtr<HTMLInputElement> input(element());
+
     // We don't ask InputType::setValue to dispatch events because
     // TextFieldInputType dispatches events different way from InputType.
@@ -86 +90 @@
 
     if (valueChanged)
-        element()->updateInnerTextValue();
+        input->updateInnerTextValue();
 
     unsigned max = visibleValue().length();
-    if (element()->focused())
-        element()->setSelectionRange(max, max);
+    if (input->focused())
+        input->setSelectionRange(max, max);
     else
-        element()->cacheSelectionInResponseToSetValue(max);
+        input->cacheSelectionInResponseToSetValue(max);
 
     if (!valueChanged)
         return;
 
-    if (eventBehavior != DispatchNoEvent) {
+    switch (eventBehavior) {
+    case DispatchChangeEvent:
         // If the user is still editing this field, dispatch an input event rather than a change event.
         // The change event will be dispatched when editing finishes.
-        if (element()->focused())
-            element()->dispatchFormControlInputEvent();
+        if (input->focused())
+            input->dispatchFormControlInputEvent();
         else
-            element()->dispatchFormControlChangeEvent();
+            input->dispatchFormControlChangeEvent();
+        break;
+
+    case DispatchInputAndChangeEvent: {
+        input->dispatchFormControlInputEvent();
+        input->dispatchFormControlChangeEvent();
+        break;
+    }
+
+    case DispatchNoEvent:
+        break;
     }
 
     // FIXME: Why do we do this when eventBehavior == DispatchNoEvent
-    if (!element()->focused() || eventBehavior == DispatchNoEvent)
-        element()->setTextAsOfLastFormControlChangeEvent(sanitizedValue);
+    if (!input->focused() || eventBehavior == DispatchNoEvent)
+        input->setTextAsOfLastFormControlChangeEvent(sanitizedValue);
 }