Changeset 108051 in webkit

Timestamp:

Feb 17, 2012, 1:22:41 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[Forms] Integrate InputType::dispatchChangeEventInResponseToSetValue into InputType::setValue
​https://bugs.webkit.org/show_bug.cgi?id=78873

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

This patch moves event dispatch logic to InputType and TextFieldInputType from HTMLInputElement
and merge dispatchChangeEventInResponseToSetValue to setValue.

No new tests. No change in behavior.

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::setValue): Move dispatch logic to InputType and TextFieldInput.

• html/InputType.cpp: Remove dispatchChangeEventInResponseToSetValue implementation.
• html/InputType.h: Remove dispatchChangeEventInResponseToSetValue declaration.

(WebCore::InputType::setValue): Move code from dispatchChangeEventInResponseToSetValue.

• html/TextFieldInputType.cpp: Remove dispatchChangeEventInResponseToSetValue implementation.
• html/TextFieldInputType.h: Remove dispatchChangeEventInResponseToSetValue declaration.

(WebCore::TextFieldInputType::setValue): Move code from dispatchChangeEventInResponseToSetValue. Stop dispatching event in InputType::setValue.

• html/HTMLTextFormControlElement.h: Make setTextAsOfLastFormControlChangeEvent to public from protected for accessing from InputType class.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLInputElement.cpp (modified) (1 diff)
• html/HTMLTextFormControlElement.h (modified) (2 diffs)
• html/InputType.cpp (modified) (1 diff)
• html/InputType.h (modified) (1 diff)
• html/TextFieldInputType.cpp (modified) (2 diffs)
• html/TextFieldInputType.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-17  Yosifumi Inoue  <yosin@chromium.org>
+
+        [Forms] Integrate InputType::dispatchChangeEventInResponseToSetValue into InputType::setValue
+        https://bugs.webkit.org/show_bug.cgi?id=78873
+
+        Reviewed by Kent Tamura.
+
+        This patch moves event dispatch logic to InputType and TextFieldInputType from HTMLInputElement
+        and merge dispatchChangeEventInResponseToSetValue to setValue.
+
+        No new tests. No change in behavior.
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::setValue): Move dispatch logic to InputType and TextFieldInput.
+        * html/InputType.cpp: Remove dispatchChangeEventInResponseToSetValue implementation.
+        * html/InputType.h: Remove dispatchChangeEventInResponseToSetValue declaration.
+        (WebCore::InputType::setValue): Move code from dispatchChangeEventInResponseToSetValue.
+        * html/TextFieldInputType.cpp: Remove dispatchChangeEventInResponseToSetValue implementation.
+        * html/TextFieldInputType.h: Remove dispatchChangeEventInResponseToSetValue declaration.
+        (WebCore::TextFieldInputType::setValue): Move code from dispatchChangeEventInResponseToSetValue. Stop dispatching event in InputType::setValue.
+        * html/HTMLTextFormControlElement.h: Make setTextAsOfLastFormControlChangeEvent to public from protected for accessing from InputType class.
+
 2012-02-17  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -1044 +1044 @@
         return;
 
-    if (eventBehavior != DispatchNoEvent)
-        m_inputType->dispatchChangeEventInResponseToSetValue();
-
-    // FIXME: Why do we do this when eventBehavior == DispatchNoEvent
-    if (isTextField() && (!focused() || eventBehavior == DispatchNoEvent))
-        setTextAsOfLastFormControlChangeEvent(value);
-
     notifyFormStateChanged();
 }

trunk/Source/WebCore/html/HTMLTextFormControlElement.h

@@ -83 +83 @@
     String directionForFormData() const;
 
+    void setTextAsOfLastFormControlChangeEvent(const String& text) { m_textAsOfLastFormControlChangeEvent = text; }
+
 protected:
     HTMLTextFormControlElement(const QualifiedName&, Document*, HTMLFormElement*);
@@ -89 +91 @@
     virtual void parseAttribute(Attribute*) OVERRIDE;
 
-    void setTextAsOfLastFormControlChangeEvent(const String& text) { m_textAsOfLastFormControlChangeEvent = text; }
-    
     void cacheSelection(int start, int end, TextFieldSelectionDirection direction)
     {

trunk/Source/WebCore/html/InputType.cpp

@@ -541 +541 @@
 }
 
-void InputType::setValue(const String& sanitizedValue, bool, TextFieldEventBehavior eventBehavior)
+void InputType::setValue(const String& sanitizedValue, bool valueChanged, TextFieldEventBehavior eventBehavior)
 {
     element()->setValueInternal(sanitizedValue, eventBehavior);
     element()->setNeedsStyleRecalc();
-}
-
-void InputType::dispatchChangeEventInResponseToSetValue()
-{
-    element()->dispatchFormControlChangeEvent();
+    if (valueChanged && eventBehavior != DispatchNoEvent)
+        element()->dispatchFormControlChangeEvent();
 }
 

trunk/Source/WebCore/html/InputType.h

@@ -228 +228 @@
     virtual bool storesValueSeparateFromAttribute();
     virtual void setValue(const String&, bool valueChanged, TextFieldEventBehavior);
-    virtual void dispatchChangeEventInResponseToSetValue();
     virtual bool shouldResetOnDocumentActivation();
     virtual bool shouldRespectListAttribute();

trunk/Source/WebCore/html/TextFieldInputType.cpp

@@ -81 +81 @@
 void TextFieldInputType::setValue(const String& sanitizedValue, bool valueChanged, TextFieldEventBehavior eventBehavior)
 {
-    InputType::setValue(sanitizedValue, valueChanged, eventBehavior);
+    // We don't ask InputType::setValue to dispatch events because
+    // TextFieldInputType dispatches events different way from InputType.
+    InputType::setValue(sanitizedValue, valueChanged, DispatchNoEvent);
 
     if (valueChanged)
@@ -91 +93 @@
     else
         element()->cacheSelectionInResponseToSetValue(max);
-}
-
-void TextFieldInputType::dispatchChangeEventInResponseToSetValue()
-{
-    // 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();
-        return;
-    }
-    InputType::dispatchChangeEventInResponseToSetValue();
+
+    if (!valueChanged)
+        return;
+
+    if (eventBehavior != DispatchNoEvent) {
+        // 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();
+        else
+            element()->dispatchFormControlChangeEvent();
+    }
+
+    // FIXME: Why do we do this when eventBehavior == DispatchNoEvent
+    if (!element()->focused() || eventBehavior == DispatchNoEvent)
+        element()->setTextAsOfLastFormControlChangeEvent(sanitizedValue);
 }
 

trunk/Source/WebCore/html/TextFieldInputType.h

@@ -75 +75 @@
     virtual bool shouldUseInputMethod() const OVERRIDE;
     virtual void setValue(const String&, bool valueChanged, TextFieldEventBehavior) OVERRIDE;
-    virtual void dispatchChangeEventInResponseToSetValue() OVERRIDE;
     virtual String sanitizeValue(const String&) const OVERRIDE;
     virtual bool shouldRespectListAttribute() OVERRIDE;