Changeset 58564 in webkit

Timestamp:

Apr 30, 2010 1:45:49 AM (14 years ago)

Author:

tkent@chromium.org

Message:

Implement interactive behavior of spin buttons.
​https://bugs.webkit.org/show_bug.cgi?id=27968

Reviewed by Adele Peterson.

WebCore:

Introduce SpinButtonElement. It is a shadow element class for
spin buttons. If the upper side of the element is clicked, calls
HTMLInputElement::stepUpFromRenderer(1). If the lower button is
clicked, calls HTMLInputElement::stepUpFromRenderer(-1).

SpinButtonElement tracks the mouse pointer position, and
RenderTheme sets ControlStates::SpinUpState if the pointer is on
the upper side.

Test: platform/mac/fast/forms/input-number-click.html

• dom/Element.h:

(WebCore::Element::isSpinButtonElement):

• editing/VisibleSelection.cpp:

(WebCore::VisibleSelection::adjustSelectionToAvoidCrossingEditingBoundaries):

Remove an assertion. lastEditablePositionBeforePositionInRoot() can
return null in a case that m_end is at a shadow element (a spin button)
and baseRoot is another shadow element (inner text block) in the same
node (an INPUT element).

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::stepUpFromRenderer):

• html/HTMLInputElement.h:

(WebCore::HTMLInputElement::hasSpinButton):

Add types supporting step attribute except RANGE.

• rendering/RenderTextControlSingleLine.cpp:

(WebCore::RenderTextControlSingleLine::nodeAtPoint):
(WebCore::RenderTextControlSingleLine::forwardEvent):
(WebCore::RenderTextControlSingleLine::preferredContentWidth):
(WebCore::RenderTextControlSingleLine::createSubtreeIfNeeded):

• rendering/RenderTextControlSingleLine.h:
• rendering/RenderTheme.cpp:

(WebCore::RenderTheme::controlStatesForRenderer):
(WebCore::RenderTheme::isSpinUpButtonPartPressed):
(WebCore::RenderTheme::isSpinUpButtonPartHovered):

• rendering/RenderTheme.h:
• rendering/TextControlInnerElements.cpp:

(WebCore::SpinButtonElement::SpinButtonElement):
(WebCore::SpinButtonElement::defaultEventHandler):

• rendering/TextControlInnerElements.h:

(WebCore::SpinButtonElement::isSpinButtonElement):
(WebCore::SpinButtonElement::isEnabledFormControl):
(WebCore::SpinButtonElement::onUpButton):

LayoutTests:

• platform/mac/fast/forms/input-number-click-expected.txt: Added.
• platform/mac/fast/forms/input-number-click.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/forms/input-number-click-expected.txt (added)
• LayoutTests/platform/mac/fast/forms/input-number-click.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/html.css (modified) (2 diffs)
• WebCore/dom/Element.h (modified) (1 diff)
• WebCore/editing/VisibleSelection.cpp (modified) (1 diff)
• WebCore/html/HTMLInputElement.cpp (modified) (1 diff)
• WebCore/html/HTMLInputElement.h (modified) (2 diffs)
• WebCore/rendering/RenderTextControlSingleLine.cpp (modified) (3 diffs)
• WebCore/rendering/RenderTextControlSingleLine.h (modified) (1 diff)
• WebCore/rendering/RenderTheme.cpp (modified) (4 diffs)
• WebCore/rendering/RenderTheme.h (modified) (1 diff)
• WebCore/rendering/TextControlInnerElements.cpp (modified) (1 diff)
• WebCore/rendering/TextControlInnerElements.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-30  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Adele Peterson.
+
+        Implement interactive behavior of spin buttons.
+        https://bugs.webkit.org/show_bug.cgi?id=27968
+
+        * platform/mac/fast/forms/input-number-click-expected.txt: Added.
+        * platform/mac/fast/forms/input-number-click.html: Added.
+
 2010-04-30  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-30  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Adele Peterson.
+
+        Implement interactive behavior of spin buttons.
+        https://bugs.webkit.org/show_bug.cgi?id=27968
+
+        Introduce SpinButtonElement. It is a shadow element class for
+        spin buttons. If the upper side of the element is clicked, calls
+        HTMLInputElement::stepUpFromRenderer(1). If the lower button is
+        clicked, calls HTMLInputElement::stepUpFromRenderer(-1).
+
+        SpinButtonElement tracks the mouse pointer position, and
+        RenderTheme sets ControlStates::SpinUpState if the pointer is on
+        the upper side.
+
+        Test: platform/mac/fast/forms/input-number-click.html
+
+        * dom/Element.h:
+        (WebCore::Element::isSpinButtonElement):
+        * editing/VisibleSelection.cpp:
+        (WebCore::VisibleSelection::adjustSelectionToAvoidCrossingEditingBoundaries):
+         Remove an assertion. lastEditablePositionBeforePositionInRoot() can
+         return null in a case that m_end is at a shadow element (a spin button)
+         and baseRoot is another shadow element (inner text block) in the same
+         node (an INPUT element).
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::stepUpFromRenderer):
+        * html/HTMLInputElement.h:
+        (WebCore::HTMLInputElement::hasSpinButton):
+         Add types supporting step attribute except RANGE.
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::nodeAtPoint):
+        (WebCore::RenderTextControlSingleLine::forwardEvent):
+        (WebCore::RenderTextControlSingleLine::preferredContentWidth):
+        (WebCore::RenderTextControlSingleLine::createSubtreeIfNeeded):
+        * rendering/RenderTextControlSingleLine.h:
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::controlStatesForRenderer):
+        (WebCore::RenderTheme::isSpinUpButtonPartPressed):
+        (WebCore::RenderTheme::isSpinUpButtonPartHovered):
+        * rendering/RenderTheme.h:
+        * rendering/TextControlInnerElements.cpp:
+        (WebCore::SpinButtonElement::SpinButtonElement):
+        (WebCore::SpinButtonElement::defaultEventHandler):
+        * rendering/TextControlInnerElements.h:
+        (WebCore::SpinButtonElement::isSpinButtonElement):
+        (WebCore::SpinButtonElement::isEnabledFormControl):
+        (WebCore::SpinButtonElement::onUpButton):
+
 2010-04-30  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/WebCore/css/html.css

@@ -363 +363 @@
     -webkit-appearance: inner-spin-button;
     display: inline-block;
+    -webkit-user-select: none;
 }
 
@@ -369 +370 @@
     display: inline-block;
     margin-left: 2px;
+    -webkit-user-select: none;
 }
 

trunk/WebCore/dom/Element.h

@@ -253 +253 @@
     virtual bool isEnabledFormControl() const { return true; }
     virtual bool isReadOnlyFormControl() const { return false; }
+    virtual bool isSpinButtonElement() const { return false; }
     virtual bool isTextFormControl() const { return false; }
     virtual bool isOptionalFormControl() const { return false; }

trunk/WebCore/editing/VisibleSelection.cpp

@@ -482 +482 @@
             VisiblePosition last = lastEditablePositionBeforePositionInRoot(m_end, baseRoot);
             m_end = last.deepEquivalent();
-            if (m_end.isNull()) {
-                ASSERT_NOT_REACHED();
+            if (m_end.isNull())
                 m_end = m_start;
-            }
         }
     // The selection is based in non-editable content.

trunk/WebCore/html/HTMLInputElement.cpp

@@ -2762 +2762 @@
 #endif // ENABLE(DATALIST)
 
+void HTMLInputElement::stepUpFromRenderer(int n)
+{
+    // The difference from stepUp()/stepDown() is:
+    // If the current value is invalid, the value will be
+    //  - the minimum value if n > 0
+    //  - the maximum value if n < 0
+
+    ASSERT(hasSpinButton());
+    if (!hasSpinButton())
+        return;
+    ASSERT(n);
+    if (!n)
+        return;
+
+    const double nan = numeric_limits<double>::quiet_NaN();
+    double current = parseToDouble(value(), nan);
+    if (!isfinite(current)) {
+        setValue(serialize(n > 0 ? minimum() : maximum()));
+        return;
+    }
+    ExceptionCode ec;
+    stepUp(n, ec);
+}
+
 } // namespace

trunk/WebCore/html/HTMLInputElement.h

@@ -122 +122 @@
     void stepUp(ExceptionCode& ec) { stepUp(1, ec); }
     void stepDown(ExceptionCode& ec) { stepDown(1, ec); }
+    // stepUp()/stepDown() for user-interaction.
+    void stepUpFromRenderer(int);
 
     bool isTextButton() const { return m_type == SUBMIT || m_type == RESET || m_type == BUTTON; }
@@ -129 +131 @@
     virtual bool isInputTypeHidden() const { return m_type == HIDDEN; }
     virtual bool isPasswordField() const { return m_type == PASSWORD; }
-    virtual bool hasSpinButton() const { return m_type == NUMBER; }
+    virtual bool hasSpinButton() const { return m_type == NUMBER || m_type == DATE || m_type == DATETIME || m_type == DATETIMELOCAL || m_type == MONTH || m_type == TIME || m_type == WEEK; }
 
     bool checked() const { return m_checked; }

trunk/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -282 +282 @@
         hitInnerTextElement(result, xPos, yPos, tx, ty);
 
+    // If we found a spin button, we're done.
+    if (m_outerSpinButton && result.innerNode() == m_outerSpinButton)
+        return true;
     // If we're not a search field, or we already found the results or cancel buttons, we're done.
     if (!m_innerBlock || result.innerNode() == m_resultsButton || result.innerNode() == m_cancelButton)
@@ -332 +335 @@
 
     FloatPoint localPoint = innerTextRenderer->absoluteToLocal(static_cast<MouseEvent*>(event)->absoluteLocation(), false, true);
+    int textRight = innerTextRenderer->borderBoxRect().right();
     if (m_resultsButton && localPoint.x() < innerTextRenderer->borderBoxRect().x())
         m_resultsButton->defaultEventHandler(event);
-    else if (m_cancelButton && localPoint.x() > innerTextRenderer->borderBoxRect().right())
+    else if (m_cancelButton && localPoint.x() > textRight && localPoint.x() < textRight + m_cancelButton->renderBox()->width())
         m_cancelButton->defaultEventHandler(event);
+    else if (m_outerSpinButton && localPoint.x() > textRight)
+        m_outerSpinButton->defaultEventHandler(event);
     else
         RenderTextControl::forwardEvent(event);
@@ -503 +509 @@
         RenderTextControl::createSubtreeIfNeeded(m_innerBlock.get());
         if (inputElement()->hasSpinButton() && !m_outerSpinButton) {
-            // FIXME: Introduce a dedicated element for spin buttons.
-            m_outerSpinButton = new TextControlInnerElement(document(), node());
+            m_outerSpinButton = new SpinButtonElement(document(), node());
             m_outerSpinButton->attachInnerElement(node(), createOuterSpinButtonStyle(), renderArena());
         }

trunk/WebCore/rendering/RenderTextControlSingleLine.h

@@ -33 +33 @@
 class SearchFieldResultsButtonElement;
 class SearchPopupMenu;
+class SpinButtonElement;
 class TextControlInnerElement;
 

trunk/WebCore/rendering/RenderTheme.cpp

@@ -37 +37 @@
 #include "SelectionController.h"
 #include "Settings.h"
+#include "TextControlInnerElements.h"
 
 // The methods in this file are shared by all themes on every platform.
@@ -658 +659 @@
 {
     ControlStates result = 0;
-    if (isHovered(o))
+    if (isHovered(o)) {
         result |= HoverState;
-    if (isPressed(o))
+        if (isSpinUpButtonPartHovered(o))
+            result |= SpinUpState;
+    }
+    if (isPressed(o)) {
         result |= PressedState;
+        if (isSpinUpButtonPartPressed(o))
+            result |= SpinUpState;
+    }
     if (isFocused(o) && o->style()->outlineStyleIsAuto())
         result |= FocusState;
@@ -745 +752 @@
 }
 
+bool RenderTheme::isSpinUpButtonPartPressed(const RenderObject* o) const
+{
+    Node* node = o->node();
+    if (!node || !node->active() || !node->isElementNode()
+        || !static_cast<Element*>(node)->isSpinButtonElement())
+        return false;
+    SpinButtonElement* element = static_cast<SpinButtonElement*>(node);
+    return element->onUpButton();
+}
+
 bool RenderTheme::isReadOnlyControl(const RenderObject* o) const
 {
@@ -758 +775 @@
         return false;
     return o->node()->hovered();
+}
+
+bool RenderTheme::isSpinUpButtonPartHovered(const RenderObject* o) const
+{
+    Node* node = o->node();
+    if (!node || !node->active() || !node->isElementNode()
+        || !static_cast<Element*>(node)->isSpinButtonElement())
+        return false;
+    SpinButtonElement* element = static_cast<SpinButtonElement*>(node);
+    return element->onUpButton();
 }
 

trunk/WebCore/rendering/RenderTheme.h

@@ -290 +290 @@
     bool isFocused(const RenderObject*) const;
     bool isPressed(const RenderObject*) const;
+    bool isSpinUpButtonPartPressed(const RenderObject*) const;
     bool isHovered(const RenderObject*) const;
+    bool isSpinUpButtonPartHovered(const RenderObject*) const;
     bool isReadOnlyControl(const RenderObject*) const;
     bool isDefault(const RenderObject*) const;

trunk/WebCore/rendering/TextControlInnerElements.cpp

@@ -212 +212 @@
 }
 
-}
+SpinButtonElement::SpinButtonElement(Document* doc, Node* shadowParent)
+    : TextControlInnerElement(doc, shadowParent)
+    , m_capturing(false)
+    , m_onUpButton(false)
+{
+}
+
+void SpinButtonElement::defaultEventHandler(Event* evt)
+{
+    if (!evt->isMouseEvent()) {
+        if (!evt->defaultHandled())
+            HTMLDivElement::defaultEventHandler(evt);
+        return;
+    }
+    const MouseEvent* mevt = static_cast<MouseEvent*>(evt);
+    if (mevt->button() != LeftButton) {
+        if (!evt->defaultHandled())
+            HTMLDivElement::defaultEventHandler(evt);
+        return;
+    }
+
+    HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowAncestorNode());
+    IntPoint local = roundedIntPoint(renderBox()->absoluteToLocal(mevt->absoluteLocation(), false, true));
+    if (evt->type() == eventNames().clickEvent) {
+        if (renderBox()->borderBoxRect().contains(local)) {
+            input->focus();
+            input->select();
+            if (local.y() < renderBox()->y() + renderBox()->height() / 2)
+                input->stepUpFromRenderer(1);
+            else
+                input->stepUpFromRenderer(-1);
+            evt->setDefaultHandled();
+        }
+    } else if (evt->type() == eventNames().mousemoveEvent) {
+        if (renderBox()->borderBoxRect().contains(local)) {
+            if (!m_capturing) {
+                if (Frame* frame = document()->frame()) {
+                    frame->eventHandler()->setCapturingMouseEventsNode(input);
+                    m_capturing = true;
+                }
+            }
+            bool oldOnUpButton = m_onUpButton;
+            m_onUpButton = local.y() < renderBox()->y() + renderBox()->height() / 2;
+            if (m_onUpButton != oldOnUpButton)
+                renderer()->repaint();
+        } else {
+            if (m_capturing) {
+                if (Frame* frame = document()->frame()) {
+                    frame->eventHandler()->setCapturingMouseEventsNode(0);
+                    m_capturing = false;
+                }
+            }
+        }
+    }
+    if (!evt->defaultHandled())
+        HTMLDivElement::defaultEventHandler(evt);
+}
+
+}

trunk/WebCore/rendering/TextControlInnerElements.h

@@ -69 +69 @@
 };
 
+class SpinButtonElement : public TextControlInnerElement {
+public:
+    SpinButtonElement(Document*, Node*);
+    virtual bool isSpinButtonElement() const { return true; }
+    virtual bool isEnabledFormControl() { return static_cast<Element*>(shadowAncestorNode())->isEnabledFormControl(); }
+    virtual void defaultEventHandler(Event*);
+
+    bool onUpButton() const { return m_onUpButton; }
+    static const AtomicString& spinButtonNodeName();
+
+private:
+    bool m_capturing;
+    bool m_onUpButton;
+};
+
 } //namespace