Changeset 87371 in webkit

Timestamp:

May 26, 2011 2:10:51 AM (13 years ago)

Author:

tkent@chromium.org

Message:

2011-05-26 Kent Tamura <​tkent@chromium.org>

Reviewed by Dimitri Glazkov.

Fix a bug that <input type="number"> dispatches two blurs when tabbing
from an invalid number
​https://bugs.webkit.org/show_bug.cgi?id=59071

• fast/forms/input-number-blur-twice-expected.txt: Added.
• fast/forms/input-number-blur-twice.html: Added.

2011-05-26 Kent Tamura <​tkent@chromium.org>

Reviewed by Dimitri Glazkov.

Fix a bug that <input type="number"> dispatches two blurs when tabbing
from an invalid number
​https://bugs.webkit.org/show_bug.cgi?id=59071

NumberInputType::handleBlurEvent() dispatched an extra focus event
and an extra blur event because
SelectionController::textWillBeReplaced() called by
RenderTextControlSingleLine::updateFromElement() focuses a node
with the selection.

In order to avoid this problem,

• Introduce Node::willBlur() It is called before any state changes by a blur event.
• Call RenderTextControlSingleLine::updateFromElement() in willBlur() It avoids extra focus/blur events because Document::m_focusedNode is still the number input during willBlur().

Test: fast/forms/input-number-blur-twice.html

• dom/Document.cpp: (WebCore::Document::setFocusedNode): Calls Node::beforeBlueEvent().
• dom/Node.cpp: (WebCore::Node::willBlur): Default empty implementation of willBlur().
• dom/Node.h: Declare willBlur().
• html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::willBlur): Added. It just calls InputType::willBlur(). (WebCore::HTMLInputElement::handleBlurEvent): Removed InputType::handleBlurEvent() call.
• html/HTMLInputElement.h: Declare willBlur().
• html/InputType.cpp: (WebCore::InputType::willBlur): Default empty implementation. (WebCore::InputType::handleBlurEvent): Removed.
• html/InputType.h: Declare willBlur(), remove handleBlurEvent().
• html/NumberInputType.cpp: (WebCore::NumberInputType::willBlur): Move the code in handleBlurEvent() here.
• html/NumberInputType.h: Declare willBlur().

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/input-number-blur-twice-expected.txt (added)
• LayoutTests/fast/forms/input-number-blur-twice.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)
• Source/WebCore/dom/Node.cpp (modified) (1 diff)
• Source/WebCore/dom/Node.h (modified) (1 diff)
• Source/WebCore/html/HTMLInputElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLInputElement.h (modified) (1 diff)
• Source/WebCore/html/InputType.cpp (modified) (1 diff)
• Source/WebCore/html/InputType.h (modified) (1 diff)
• Source/WebCore/html/NumberInputType.cpp (modified) (1 diff)
• Source/WebCore/html/NumberInputType.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-26  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix a bug that <input type="number"> dispatches two blurs when tabbing
+        from an invalid number
+        https://bugs.webkit.org/show_bug.cgi?id=59071
+
+        * fast/forms/input-number-blur-twice-expected.txt: Added.
+        * fast/forms/input-number-blur-twice.html: Added.
+
 2011-05-26  Shane Stephens  <shanestephens@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-26  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix a bug that <input type="number"> dispatches two blurs when tabbing
+        from an invalid number
+        https://bugs.webkit.org/show_bug.cgi?id=59071
+
+        NumberInputType::handleBlurEvent() dispatched an extra focus event
+        and an extra blur event because
+        SelectionController::textWillBeReplaced() called by
+        RenderTextControlSingleLine::updateFromElement() focuses a node
+        with the selection.
+
+        In order to avoid this problem,
+         - Introduce Node::willBlur()
+           It is called before any state changes by a blur event.
+         - Call RenderTextControlSingleLine::updateFromElement() in willBlur()
+           It avoids extra focus/blur events because Document::m_focusedNode is
+           still the number input during willBlur().
+
+        Test: fast/forms/input-number-blur-twice.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::setFocusedNode): Calls Node::beforeBlueEvent().
+        * dom/Node.cpp:
+        (WebCore::Node::willBlur):
+          Default empty implementation of willBlur().
+        * dom/Node.h: Declare willBlur().
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::willBlur):
+          Added.  It just calls InputType::willBlur().
+        (WebCore::HTMLInputElement::handleBlurEvent):
+          Removed InputType::handleBlurEvent() call.
+        * html/HTMLInputElement.h: Declare willBlur().
+        * html/InputType.cpp:
+        (WebCore::InputType::willBlur): Default empty implementation.
+        (WebCore::InputType::handleBlurEvent): Removed.
+        * html/InputType.h: Declare willBlur(), remove handleBlurEvent().
+        * html/NumberInputType.cpp:
+        (WebCore::NumberInputType::willBlur):
+          Move the code in handleBlurEvent() here.
+        * html/NumberInputType.h: Declare willBlur().
+
 2011-05-25  Hans Wennborg  <hans@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3221 +3221 @@
     bool focusChangeBlocked = false;
     RefPtr<Node> oldFocusedNode = m_focusedNode;
-    m_focusedNode = 0;
 
     // Remove focus from the existing focus node (if any)
-    if (oldFocusedNode && !oldFocusedNode->inDetach()) { 
+    if (oldFocusedNode && !oldFocusedNode->inDetach()) {
+        // willBlur() should be called before any status changes.
+        oldFocusedNode->willBlur();
+        m_focusedNode = 0;
         if (oldFocusedNode->active())
             oldFocusedNode->setActive(false);
@@ -3269 +3271 @@
                 view()->setFocus(false);
         }
-    }
+    } else
+        m_focusedNode = 0;
 
     if (newFocusedNode) {

trunk/Source/WebCore/dom/Node.cpp

@@ -2732 +2732 @@
 }
 
+void Node::willBlur()
+{
+}
+
 void Node::dispatchBlurEvent()
 {

trunk/Source/WebCore/dom/Node.h

@@ -556 +556 @@
 
     virtual void dispatchFocusEvent();
+    virtual void willBlur();
     virtual void dispatchBlurEvent();
     virtual void dispatchChangeEvent();

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -497 +497 @@
 }
 
+void HTMLInputElement::willBlur()
+{
+    m_inputType->willBlur();
+    HTMLTextFormControlElement::willBlur();
+}
+
 void HTMLInputElement::handleBlurEvent()
 {
-    m_inputType->handleBlurEvent();
-
     if (!isTextField())
         return;

trunk/Source/WebCore/html/HTMLInputElement.h

@@ -302 +302 @@
     virtual bool isEmptySuggestedValue() const { return suggestedValue().isEmpty(); }
     virtual void handleFocusEvent();
+    virtual void willBlur();
     virtual void handleBlurEvent();
     virtual int cachedSelectionStart() const { return m_cachedSelectionStart; }

trunk/Source/WebCore/html/InputType.cpp

@@ -411 +411 @@
 }
 
-void InputType::handleBlurEvent()
+void InputType::willBlur()
 {
 }

trunk/Source/WebCore/html/InputType.h

@@ -179 +179 @@
     virtual bool isKeyboardFocusable() const;
     virtual bool shouldUseInputMethod() const;
-    virtual void handleBlurEvent();
+    virtual void willBlur();
     virtual void accessKeyAction(bool sendToAnyElement);
     virtual bool canBeSuccessfulSubmitButton();

trunk/Source/WebCore/html/NumberInputType.cpp

@@ -212 +212 @@
 }
 
-void NumberInputType::handleBlurEvent()
+void NumberInputType::willBlur()
 {
     // Reset the renderer value, which might be unmatched with the element value.

trunk/Source/WebCore/html/NumberInputType.h

@@ -64 +64 @@
     virtual String serialize(double) const;
     virtual double acceptableError(double) const;
-    virtual void handleBlurEvent();
+    virtual void willBlur();
     virtual String visibleValue() const;
     virtual String convertFromVisibleValue(const String&) const;