Changeset 91549 in webkit

Timestamp:

Jul 21, 2011 8:27:30 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

The input[type="number"] with step="any" should not suffer from step mismatch.
​https://bugs.webkit.org/show_bug.cgi?id=64858

Patch by Shinya Kawanaka <​shinyak@google.com> on 2011-07-21
Reviewed by Kent Tamura.

Source/WebCore:

Added check step="any" not to suffer from step mismatch.

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::applyStep): Added check step="any".
(WebCore::HTMLInputElement::alignValueForStep): Added.

LayoutTests:

Added test cases of input[type="number"] with step="any"

• fast/forms/input-stepup-stepdown-expected.txt: added the test cases.
• fast/forms/input-stepup-stepdown-from-renderer-expected.txt: ditto.
• fast/forms/script-tests/input-stepup-stepdown-from-renderer.js: ditto.
• fast/forms/script-tests/input-stepup-stepdown.js: ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/input-stepup-stepdown-expected.txt (modified) (1 diff)
• LayoutTests/fast/forms/input-stepup-stepdown-from-renderer-expected.txt (modified) (1 diff)
• LayoutTests/fast/forms/script-tests/input-stepup-stepdown-from-renderer.js (modified) (1 diff)
• LayoutTests/fast/forms/script-tests/input-stepup-stepdown.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLInputElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLInputElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-21  Shinya Kawanaka  <shinyak@google.com>
+
+        The input[type="number"] with step="any" should not suffer from step mismatch.
+        https://bugs.webkit.org/show_bug.cgi?id=64858
+
+        Reviewed by Kent Tamura.
+
+        Added test cases of input[type="number"] with step="any"
+
+        * fast/forms/input-stepup-stepdown-expected.txt: added the test cases.
+        * fast/forms/input-stepup-stepdown-from-renderer-expected.txt: ditto.
+        * fast/forms/script-tests/input-stepup-stepdown-from-renderer.js: ditto.
+        * fast/forms/script-tests/input-stepup-stepdown.js: ditto.
+
 2011-07-21  Robin Qiu  <robin.qiu.dev@gmail.com>
 

trunk/LayoutTests/fast/forms/input-stepup-stepdown-expected.txt

@@ -140 +140 @@
 PASS stepUp("0", "any", null) threw exception Error: INVALID_STATE_ERR: DOM Exception 11.
 PASS stepDown("0", "any", null) threw exception Error: INVALID_STATE_ERR: DOM Exception 11.
+Step=any corner case
+PASS stepUpExplicitBounds("0", "100", "any", "1.5", "1") threw exception Error: INVALID_STATE_ERR: DOM Exception 11.
+PASS stepDownExplicitBounds("0", "100", "any", "1.5", "1") threw exception Error: INVALID_STATE_ERR: DOM Exception 11.
 Overflow/underflow
 PASS stepDown("1", "1", "0") is "0"

trunk/LayoutTests/fast/forms/input-stepup-stepdown-from-renderer-expected.txt

@@ -117 +117 @@
 PASS stepUp("0", "any", null) is "1"
 PASS stepDown("0", "any", null) is "-1"
+Step=any corner case
+PASS stepUpExplicitBounds("0", "100", "any", "1.5", "1") is "2.5"
+PASS stepDownExplicitBounds("0", "100", "any", "1.5", "1") is "0.5"
 Overflow/underflow
 PASS stepDown("1", "1", "0") is "0"

trunk/LayoutTests/fast/forms/script-tests/input-stepup-stepdown-from-renderer.js

@@ -200 +200 @@
 shouldBe('stepUp("0", "any", null)', '"1"');
 shouldBe('stepDown("0", "any", null)', '"-1"');
+debug('Step=any corner case');
+shouldBe('stepUpExplicitBounds("0", "100", "any", "1.5", "1")', '"2.5"');
+shouldBe('stepDownExplicitBounds("0", "100", "any", "1.5", "1")', '"0.5"');
 debug('Overflow/underflow');
 shouldBe('stepDown("1", "1", "0")', '"0"');

trunk/LayoutTests/fast/forms/script-tests/input-stepup-stepdown.js

@@ -195 +195 @@
 shouldThrow('stepUp("0", "any", null)', invalidStateErr);
 shouldThrow('stepDown("0", "any", null)', invalidStateErr);
+debug('Step=any corner case');
+shouldThrow('stepUpExplicitBounds("0", "100", "any", "1.5", "1")', invalidStateErr);
+shouldThrow('stepDownExplicitBounds("0", "100", "any", "1.5", "1")', invalidStateErr);
 debug('Overflow/underflow');
 shouldBe('stepDown("1", "1", "0")', '"0"');

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-21  Shinya Kawanaka  <shinyak@google.com>
+
+        The input[type="number"] with step="any" should not suffer from step mismatch.
+        https://bugs.webkit.org/show_bug.cgi?id=64858
+
+        Reviewed by Kent Tamura.
+
+        Added check step="any" not to suffer from step mismatch.
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::applyStep): Added check step="any".
+        (WebCore::HTMLInputElement::alignValueForStep): Added.
+
 2011-07-21  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -416 +416 @@
         return;
     }
+
     double acceptableError = m_inputType->acceptableError(step);
     if (newValue - m_inputType->minimum() < -acceptableError) {
@@ -423 +424 @@
     if (newValue < m_inputType->minimum())
         newValue = m_inputType->minimum();
+
+    const AtomicString& stepString = fastGetAttribute(stepAttr);
+    if (!equalIgnoringCase(stepString, "any"))
+        newValue = alignValueForStep(newValue, step, currentDecimalPlaces, stepDecimalPlaces);
+
+    if (newValue - m_inputType->maximum() > acceptableError) {
+        ec = INVALID_STATE_ERR;
+        return;
+    }
+    if (newValue > m_inputType->maximum())
+        newValue = m_inputType->maximum();
+
+    setValueAsNumber(newValue, ec);
+
+    if (AXObjectCache::accessibilityEnabled())
+         document()->axObjectCache()->postNotification(renderer(), AXObjectCache::AXValueChanged, true);
+}
+
+double HTMLInputElement::alignValueForStep(double newValue, double step, unsigned currentDecimalPlaces, unsigned stepDecimalPlaces)
+{
+    if (newValue >= pow(10.0, 21.0))
+        return newValue;
+
     unsigned baseDecimalPlaces;
     double base = m_inputType->stepBaseWithDecimalPlaces(&baseDecimalPlaces);
     baseDecimalPlaces = min(baseDecimalPlaces, 16u);
-    if (newValue < pow(10.0, 21.0)) {
-      if (stepMismatch(value())) {
-            double scale = pow(10.0, static_cast<double>(max(stepDecimalPlaces, currentDecimalPlaces)));
-            newValue = round(newValue * scale) / scale;
-        } else {
-            double scale = pow(10.0, static_cast<double>(max(stepDecimalPlaces, baseDecimalPlaces)));
-            newValue = round((base + round((newValue - base) / step) * step) * scale) / scale;
-        }
-    }
-    if (newValue - m_inputType->maximum() > acceptableError) {
-        ec = INVALID_STATE_ERR;
-        return;
-    }
-    if (newValue > m_inputType->maximum())
-        newValue = m_inputType->maximum();
-    setValueAsNumber(newValue, ec);
-
-    if (AXObjectCache::accessibilityEnabled())
-         document()->axObjectCache()->postNotification(renderer(), AXObjectCache::AXValueChanged, true);
+    if (stepMismatch(value())) {
+        double scale = pow(10.0, static_cast<double>(max(stepDecimalPlaces, currentDecimalPlaces)));
+        newValue = round(newValue * scale) / scale;
+    } else {
+        double scale = pow(10.0, static_cast<double>(max(stepDecimalPlaces, baseDecimalPlaces)));
+        newValue = round((base + round((newValue - base) / step) * step) * scale) / scale;
+    }
+
+    return newValue;
 }
 

trunk/Source/WebCore/html/HTMLInputElement.h

@@ -322 +322 @@
     // Helper for stepUp()/stepDown().  Adds step value * count to the current value.
     void applyStep(double count, AnyStepHandling, ExceptionCode&);
+    double alignValueForStep(double value, double step, unsigned currentDecimalPlaces, unsigned stepDecimalPlaces);
 
 #if ENABLE(DATALIST)