Changeset 65997 in webkit

Timestamp:

Aug 25, 2010 1:38:49 AM (14 years ago)

Author:

tkent@chromium.org

Message:

Fix a bug that a spin-button doesn't release mouse capturing
​https://bugs.webkit.org/show_bug.cgi?id=44411

Reviewed by Shinichiro Hamaji

WebCore:

• LeftButton should be checked only for clickEvent. Note that this change doesn't change the behavior because button() value is initialized with LeftButton even for mousemoveEvent.
• Should pass a SpinButtonElement node to setCapturingMouseEventsNode().

Test: fast/forms/input-spinbutton-capturing.html

• rendering/TextControlInnerElements.cpp:

(WebCore::SpinButtonElement::defaultEventHandler):

LayoutTests:

• fast/forms/input-spinbutton-capturing-expected.txt: Added.
• fast/forms/input-spinbutton-capturing.html: Added.
• fast/forms/script-tests/input-spinbutton-capturing.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/input-spinbutton-capturing-expected.txt (added)
• LayoutTests/fast/forms/input-spinbutton-capturing.html (added)
• LayoutTests/fast/forms/script-tests/input-spinbutton-capturing.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/TextControlInnerElements.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-25  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Shinichiro Hamaji
+
+        Fix a bug that a spin-button doesn't release mouse capturing
+        https://bugs.webkit.org/show_bug.cgi?id=44411
+
+        * fast/forms/input-spinbutton-capturing-expected.txt: Added.
+        * fast/forms/input-spinbutton-capturing.html: Added.
+        * fast/forms/script-tests/input-spinbutton-capturing.js: Added.
+
 2010-08-25  Gavin Peters  <gavinp@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-25  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Shinichiro Hamaji
+
+        Fix a bug that a spin-button doesn't release mouse capturing
+        https://bugs.webkit.org/show_bug.cgi?id=44411
+
+        - LeftButton should be checked only for clickEvent.
+          Note that this change doesn't change the behavior because
+          button() value is initialized with LeftButton even for
+          mousemoveEvent.
+        - Should pass a SpinButtonElement node to setCapturingMouseEventsNode().
+
+        Test: fast/forms/input-spinbutton-capturing.html
+
+        * rendering/TextControlInnerElements.cpp:
+        (WebCore::SpinButtonElement::defaultEventHandler):
+
 2010-08-16  Gabor Loki  <loki@webkit.org>
 

trunk/WebCore/rendering/TextControlInnerElements.cpp

@@ -275 +275 @@
     }
 
-    MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
-    if (mouseEvent->button() != LeftButton) {
-        if (!event->defaultHandled())
-            HTMLDivElement::defaultEventHandler(event);
-        return;
-    }
-
     RenderBox* box = renderBox();
     if (!box) {
@@ -289 +282 @@
     }
     
+    MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
     HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowAncestorNode());
     if (input->disabled() || input->isReadOnlyFormControl()) {
@@ -297 +291 @@
 
     IntPoint local = roundedIntPoint(box->absoluteToLocal(mouseEvent->absoluteLocation(), false, true));
-    if (event->type() == eventNames().clickEvent) {
+    if (event->type() == eventNames().clickEvent && mouseEvent->button() == LeftButton) {
         if (box->borderBoxRect().contains(local)) {
             RefPtr<Node> protector(input);
@@ -312 +306 @@
             if (!m_capturing) {
                 if (Frame* frame = document()->frame()) {
-                    frame->eventHandler()->setCapturingMouseEventsNode(input);
+                    frame->eventHandler()->setCapturingMouseEventsNode(this);
                     m_capturing = true;
                 }