Changeset 102896 in webkit

Timestamp:

Dec 14, 2011 11:00:50 PM (12 years ago)

Author:

tkent@chromium.org

Message:

A spin button changes the value incorrectly if it is clicked after touch events.
​https://bugs.webkit.org/show_bug.cgi?id=71181

Reviewed by Ryosuke Niwa.

Source/WebCore:

SpinButtonElement assumed setHovered(true) was always called before a
mousemove event in the element. It is not true for touch events.

We should not reset m_upDownState to Indetermiante in setHovered(true),
and should reset it when the mouse pointer moves out.

This change fixes the flakiness of fast/forms/input-step-as-double.html.

Test: fast/events/touch/touch-before-pressing-spin-button.html

• html/shadow/TextControlInnerElements.cpp:

(WebCore::SpinButtonElement::defaultEventHandler):
Add an assertion that m_upDownState should not be Indetermiante.
Reset m_upDownState to Indeterminate when the mouse pointer moves out
from the element.
(WebCore::SpinButtonElement::setHovered):
Reset m_upDownState to Indeterminate when the element becomes unhovered.

LayoutTests:

• fast/events/touch/touch-before-pressing-spin-button-expected.txt: Added.
• fast/events/touch/touch-before-pressing-spin-button.html: Added.
• platform/chromium/test_expectations.txt: Remove the flakiness of fast/forms/input-step-as-double.html.
• platform/qt/Skipped: ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/touch-before-pressing-spin-button-expected.txt (added)
• LayoutTests/fast/events/touch/touch-before-pressing-spin-button.html (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/shadow/TextControlInnerElements.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-03  Kent Tamura  <tkent@chromium.org>
+
+        A spin button changes the value incorrectly if it is clicked after touch events.
+        https://bugs.webkit.org/show_bug.cgi?id=71181
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/events/touch/touch-before-pressing-spin-button-expected.txt: Added.
+        * fast/events/touch/touch-before-pressing-spin-button.html: Added.
+        * platform/chromium/test_expectations.txt:
+          Remove the flakiness of fast/forms/input-step-as-double.html.
+        * platform/qt/Skipped: ditto.
+
 2011-12-14  David Levin  <levin@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3787 +3787 @@
 BUGWK71004 : inspector/storage-panel-dom-storage.html = PASS TIMEOUT
 
-BUGWK71181 : fast/forms/input-step-as-double.html = PASS TEXT
 BUGWK71209 LINUX MAC : compositing/visibility/visibility-image-layers.html = IMAGE
 

trunk/LayoutTests/platform/qt/Skipped

@@ -2527 +2527 @@
 tables/mozilla/bugs/bug2947.html
 
-# Layout Test fast/forms/input-step-as-double.html fails after running touch event tests
-# https://bugs.webkit.org/show_bug.cgi?id=71181
-fast/forms/input-step-as-double.html
-
 # [Qt] plugins/netscape-plugin-page-cache-works.html fails
 # https://bugs.webkit.org/show_bug.cgi?id=74482

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-03  Kent Tamura  <tkent@chromium.org>
+
+        A spin button changes the value incorrectly if it is clicked after touch events.
+        https://bugs.webkit.org/show_bug.cgi?id=71181
+
+        Reviewed by Ryosuke Niwa.
+
+        SpinButtonElement assumed setHovered(true) was always called before a
+        mousemove event in the element. It is not true for touch events.
+
+        We should not reset m_upDownState to Indetermiante in setHovered(true),
+        and should reset it when the mouse pointer moves out.
+
+        This change fixes the flakiness of fast/forms/input-step-as-double.html.
+
+        Test: fast/events/touch/touch-before-pressing-spin-button.html
+
+        * html/shadow/TextControlInnerElements.cpp:
+        (WebCore::SpinButtonElement::defaultEventHandler):
+        Add an assertion that m_upDownState should not be Indetermiante.
+        Reset m_upDownState to Indeterminate when the mouse pointer moves out
+        from the element.
+        (WebCore::SpinButtonElement::setHovered):
+        Reset m_upDownState to Indeterminate when the element becomes unhovered.
+
 2011-12-14  Lucas Forschler  <lforschler@apple.com>
     

trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp

@@ -294 +294 @@
             input->select();
             if (renderer()) {
+                ASSERT(m_upDownState != Indeterminate);
                 input->stepUpFromRenderer(m_upDownState == Up ? 1 : -1);
                 if (renderer())
@@ -314 +315 @@
             if (m_upDownState != oldUpDownState)
                 renderer()->repaint();
-        } else
+        } else {
             releaseCapture();
+            m_upDownState = Indeterminate;
+        }
     }
 
@@ -367 +370 @@
 void SpinButtonElement::setHovered(bool flag)
 {
-    if (!hovered() && flag)
+    if (!flag)
         m_upDownState = Indeterminate;
     HTMLDivElement::setHovered(flag);