Changeset 109193 in webkit


Ignore:
Timestamp:
Feb 28, 2012 10:17:09 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[Forms] Spin button sometimes ignores Indeterminate of m_upDownState
https://bugs.webkit.org/show_bug.cgi?id=79754

Patch by Yoshifumi Inoue <yosin@chromium.org> on 2012-02-28
Reviewed by Kent Tamura.

Source/WebCore:

This patch checks enum value Indeterminate before using m_upDownState. This make
sure Indeterminate state doesn't act like Down state.

m_upDownState can be Indeterminate at mousedown event if mouse pointer is on
spin button when it is displayed.

Test: fast/forms/number/spin-button-state.html

  • html/shadow/TextControlInnerElements.cpp:

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

LayoutTests:

  • fast/forms/number/spin-button-state.html: Added.
  • fast/forms/number/spin-button-state-expected.txt: Added.
Location:
trunk
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r109192 r109193  
     12012-02-28  Yoshifumi Inoue  <yosin@chromium.org>
     2
     3        [Forms] Spin button sometimes ignores Indeterminate of m_upDownState
     4        https://bugs.webkit.org/show_bug.cgi?id=79754
     5
     6        Reviewed by Kent Tamura.
     7
     8        * fast/forms/number/spin-button-state.html: Added.
     9        * fast/forms/number/spin-button-state-expected.txt: Added.
     10
    1112012-02-27  MORITA Hajime  <morrita@google.com>
    212
  • trunk/Source/WebCore/ChangeLog

    r109192 r109193  
     12012-02-28  Yoshifumi Inoue  <yosin@chromium.org>
     2
     3        [Forms] Spin button sometimes ignores Indeterminate of m_upDownState
     4        https://bugs.webkit.org/show_bug.cgi?id=79754
     5
     6        Reviewed by Kent Tamura.
     7
     8        This patch checks enum value Indeterminate before using m_upDownState. This make
     9        sure Indeterminate state doesn't act like Down state.
     10
     11        m_upDownState can be Indeterminate at mousedown event if mouse pointer is on
     12        spin button when it is displayed.
     13
     14        Test: fast/forms/number/spin-button-state.html
     15
     16        * html/shadow/TextControlInnerElements.cpp:
     17        (WebCore::SpinButtonElement::defaultEventHandler):
     18        (WebCore::SpinButtonElement::repeatingTimerFired):
     19
    1202012-02-27  MORITA Hajime  <morrita@google.com>
    221
  • trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp

    r108446 r109193  
    295295            input->select();
    296296            if (renderer()) {
    297                 ASSERT(m_upDownState != Indeterminate);
    298                 input->stepUpFromRenderer(m_upDownState == Up ? 1 : -1);
    299                 if (renderer())
    300                     startRepeatingTimer();
     297                if (m_upDownState != Indeterminate) {
     298                    input->stepUpFromRenderer(m_upDownState == Up ? 1 : -1);
     299                    if (renderer())
     300                        startRepeatingTimer();
     301                }
    301302            }
    302303            event->setDefaultHandled();
     
    366367void SpinButtonElement::repeatingTimerFired(Timer<SpinButtonElement>*)
    367368{
    368     step(m_upDownState == Up ? 1 : -1);
     369    if (m_upDownState != Indeterminate)
     370        step(m_upDownState == Up ? 1 : -1);
    369371}
    370372
Note: See TracChangeset for help on using the changeset viewer.