Changeset 66001 in webkit

Timestamp:

Aug 25, 2010 2:45:06 AM (14 years ago)

Author:

tkent@chromium.org

Message:

<input type=number>: Support auto-repeat by mouse press
​https://bugs.webkit.org/show_bug.cgi?id=44476

Reviewed by Shinichiro Hamaji

WebCore:

Like arrow button of scrollbars, spinbuttons of <input
type=number> should continue to increase/decrease their values
while the mouse button is pressed.

No new tests because the new behavior strongly depends on a timer.

• rendering/TextControlInnerElements.cpp:

(WebCore::SpinButtonElement::SpinButtonElement):

Initializes the timer.

(WebCore::SpinButtonElement::defaultEventHandler):

Starts the timer by a mousedown event.

(WebCore::SpinButtonElement::startRepeatingTimer):
(WebCore::SpinButtonElement::stopRepeatingTimer):
(WebCore::SpinButtonElement::repeatingTimerFired):

• rendering/TextControlInnerElements.h:

LayoutTests:

Update existing tests.

• fast/forms/script-tests/input-spinbutton-capturing.js:
• platform/mac/fast/forms/input-appearance-spinbutton-up-expected.checksum:
• platform/mac/fast/forms/input-appearance-spinbutton-up-expected.png:
• platform/mac/fast/forms/input-appearance-spinbutton-up-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/script-tests/input-spinbutton-capturing.js (modified) (1 diff)
• LayoutTests/platform/mac/fast/forms/input-appearance-spinbutton-up-expected.checksum (modified) (1 diff)
• LayoutTests/platform/mac/fast/forms/input-appearance-spinbutton-up-expected.png (modified) (previous)
• LayoutTests/platform/mac/fast/forms/input-appearance-spinbutton-up-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/TextControlInnerElements.cpp (modified) (6 diffs)
• WebCore/rendering/TextControlInnerElements.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-25  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Shinichiro Hamaji
+
+        <input type=number>: Support auto-repeat by mouse press
+        https://bugs.webkit.org/show_bug.cgi?id=44476
+
+        Update existing tests.
+
+        * fast/forms/script-tests/input-spinbutton-capturing.js:
+        * platform/mac/fast/forms/input-appearance-spinbutton-up-expected.checksum:
+        * platform/mac/fast/forms/input-appearance-spinbutton-up-expected.png:
+        * platform/mac/fast/forms/input-appearance-spinbutton-up-expected.txt:
+
 2010-08-25  Kent Tamura  <tkent@chromium.org>
 

trunk/LayoutTests/fast/forms/script-tests/input-spinbutton-capturing.js

@@ -15 +15 @@
     // clear and this click didn't work.
     eventSender.mouseMoveTo(anotherInput.offsetLeft + anotherInput.offsetWidth - 10, anotherInput.offsetTop + anotherInput.offsetHeight / 4);
+    eventSender.mouseMoveTo(anotherInput.offsetLeft + anotherInput.offsetWidth - 10, anotherInput.offsetTop + anotherInput.offsetHeight / 4 - 1);
     eventSender.mouseDown();
     eventSender.mouseUp();

trunk/LayoutTests/platform/mac/fast/forms/input-appearance-spinbutton-up-expected.checksum

@@ -1 @@
-5c1b34460d03938fffe006161914f725
+00e1de48e3e84449e88ede94e8e11b58

trunk/LayoutTests/platform/mac/fast/forms/input-appearance-spinbutton-up-expected.txt

@@ -17 +17 @@
   RenderBlock {DIV} at (3,3) size 165x21
     RenderText {#text} at (1,0) size 12x21
-      text run at (1,0) width 12: "0"
-caret: position 0 of child 0 {DIV} of child 5 {INPUT} of body
+      text run at (1,0) width 12: "1"
+caret: position 1 of child 0 {#text} of child 0 {DIV} of child 5 {INPUT} of body

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-25  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Shinichiro Hamaji
+
+        <input type=number>: Support auto-repeat by mouse press
+        https://bugs.webkit.org/show_bug.cgi?id=44476
+
+        Like arrow button of scrollbars, spinbuttons of <input
+        type=number> should continue to increase/decrease their values
+        while the mouse button is pressed.
+
+        No new tests because the new behavior strongly depends on a timer.
+
+        * rendering/TextControlInnerElements.cpp:
+        (WebCore::SpinButtonElement::SpinButtonElement):
+         Initializes the timer.
+        (WebCore::SpinButtonElement::defaultEventHandler):
+         Starts the timer by a mousedown event.
+        (WebCore::SpinButtonElement::startRepeatingTimer):
+        (WebCore::SpinButtonElement::stopRepeatingTimer):
+        (WebCore::SpinButtonElement::repeatingTimerFired):
+        * rendering/TextControlInnerElements.h:
+
 2010-08-25  Gabor Loki  <loki@webkit.org>
 

trunk/WebCore/rendering/TextControlInnerElements.cpp

@@ -40 +40 @@
 #include "RenderLayer.h"
 #include "RenderTextControlSingleLine.h"
+#include "ScrollbarTheme.h"
 #include "SpeechInput.h"
 
@@ -259 +260 @@
     , m_capturing(false)
     , m_upDownState(Indeterminate)
+    , m_pressStartingState(Indeterminate)
+    , m_repeatingTimer(this, &SpinButtonElement::repeatingTimerFired)
 {
 }
@@ -282 +285 @@
     }
     
-    MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
     HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowAncestorNode());
     if (input->disabled() || input->isReadOnlyFormControl()) {
@@ -290 +292 @@
     }
 
+    MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
     IntPoint local = roundedIntPoint(box->absoluteToLocal(mouseEvent->absoluteLocation(), false, true));
-    if (event->type() == eventNames().clickEvent && mouseEvent->button() == LeftButton) {
+    if (mouseEvent->type() == eventNames().mousedownEvent && mouseEvent->button() == LeftButton) {
         if (box->borderBoxRect().contains(local)) {
             RefPtr<Node> protector(input);
             input->focus();
             input->select();
-            if (local.y() < box->height() / 2)
-                input->stepUpFromRenderer(1);
-            else
-                input->stepUpFromRenderer(-1);
+            input->stepUpFromRenderer(m_upDownState == Up ? 1 : -1);
             event->setDefaultHandled();
-        }
-    } else if (event->type() == eventNames().mousemoveEvent) {
+            startRepeatingTimer();
+        }
+    } else if (mouseEvent->type() == eventNames().mouseupEvent && mouseEvent->button() == LeftButton)
+        stopRepeatingTimer();
+    else if (event->type() == eventNames().mousemoveEvent) {
         if (box->borderBoxRect().contains(local)) {
             if (!m_capturing) {
@@ -316 +319 @@
         } else {
             if (m_capturing) {
+                stopRepeatingTimer();
                 if (Frame* frame = document()->frame()) {
                     frame->eventHandler()->setCapturingMouseEventsNode(0);
@@ -326 +330 @@
     if (!event->defaultHandled())
         HTMLDivElement::defaultEventHandler(event);
+}
+
+void SpinButtonElement::startRepeatingTimer()
+{
+    m_pressStartingState = m_upDownState;
+    ScrollbarTheme* theme = ScrollbarTheme::nativeTheme();
+    m_repeatingTimer.start(theme->initialAutoscrollTimerDelay(), theme->autoscrollTimerDelay());
+}
+
+void SpinButtonElement::stopRepeatingTimer()
+{
+    m_repeatingTimer.stop();
+}
+
+void SpinButtonElement::repeatingTimerFired(Timer<SpinButtonElement>*)
+{
+    HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowAncestorNode());
+    if (input->disabled() || input->isReadOnlyFormControl())
+        return;
+    // On Mac OS, NSStepper updates the value for the button under the mouse
+    // cursor regardless of the button pressed at the beginning. So the
+    // following check is not needed for Mac OS.
+#if !OS(MAC_OS_X)
+    if (m_upDownState != m_pressStartingState)
+        return;
+#endif
+    input->stepUpFromRenderer(m_upDownState == Up ? 1 : -1);
 }
 

trunk/WebCore/rendering/TextControlInnerElements.h

@@ -30 +30 @@
 #include "HTMLDivElement.h"
 #include "SpeechInputListener.h"
+#include "Timer.h"
 #include <wtf/Forward.h>
 
@@ -108 +109 @@
     virtual bool isReadOnlyFormControl() const { return static_cast<Element*>(const_cast<SpinButtonElement*>(this)->shadowAncestorNode())->isReadOnlyFormControl(); }
     virtual void defaultEventHandler(Event*);
+    void startRepeatingTimer();
+    void stopRepeatingTimer();
+    void repeatingTimerFired(Timer<SpinButtonElement>*);
     virtual void setHovered(bool = true);
 
     bool m_capturing;
     UpDownState m_upDownState;
+    UpDownState m_pressStartingState;
+    Timer<SpinButtonElement> m_repeatingTimer;
 };