Changeset 86650 in webkit

Timestamp:

May 16, 2011 7:34:25 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-16 Naoki Takano <​takano.naoki@gmail.com>

Reviewed by Kent Tamura.

HTML5 Number Spinbox displays a 0 in situations where a 0 is not between the min and max.
​https://bugs.webkit.org/show_bug.cgi?id=60871

• fast/forms/input-stepup-stepdown-from-renderer-expected.txt: Added expected results.
• fast/forms/script-tests/input-stepup-stepdown-from-renderer.js: Added test patterns when initial values are empty.

2011-05-16 Naoki Takano <​takano.naoki@gmail.com>

Reviewed by Kent Tamura.

HTML5 Number Spinbox displays a 0 in situations where a 0 is not between the min and max.
​https://bugs.webkit.org/show_bug.cgi?id=60871

Test: fast/forms/input-stepup-stepdown-from-renderer.html

In number input type, if the value is not a number, including empty, the currect valued is assumed 0.
But we have to handle it separately from the case when the value is actuall "0".

• html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::stepUpFromRenderer): Added cliping for default value.

Location:

trunk

Files:

• LayoutTests/ChangeLog (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)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLInputElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-16  Naoki Takano  <takano.naoki@gmail.com>
+
+        Reviewed by Kent Tamura.
+
+        HTML5 Number Spinbox displays a 0 in situations where a 0 is not between the min and max.
+        https://bugs.webkit.org/show_bug.cgi?id=60871
+
+        * fast/forms/input-stepup-stepdown-from-renderer-expected.txt: Added expected results.
+        * fast/forms/script-tests/input-stepup-stepdown-from-renderer.js: Added test patterns when initial values are empty.
+
 2011-05-16  Adam Barth  <abarth@webkit.org>
 

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

@@ -145 +145 @@
 PASS stepUpExplicitBounds("4", "9", "0.005", "5.005", 11) is "5.06"
 PASS stepUpExplicitBounds("4", "9", "0.005", "5.005", 12) is "5.065"
+PASS stepUpExplicitBounds(-4, 4, 1, "") is "1"
+PASS stepDownExplicitBounds(-4, 4, 1, "") is "-1"
+PASS stepDownExplicitBounds(0, 4, 1, "") is "0"
+PASS stepUpExplicitBounds(-4, 0, 1, "") is "0"
+PASS stepDownExplicitBounds(1, 4, 1, "") is "1"
+PASS stepUpExplicitBounds(1, 4, 1, "") is "1"
+PASS stepDownExplicitBounds(-4, -1, 1, "") is "-1"
+PASS stepUpExplicitBounds(-4, -1, 1, "") is "-1"
+PASS stepUpExplicitBounds(-100, null, 3, "") is "2"
+PASS stepDownExplicitBounds(-100, null, 3, "") is "-1"
+PASS stepUpExplicitBounds(1, 4, 1, 0) is "1"
+PASS stepDownExplicitBounds(1, 4, 1, 0) is "0"
+PASS stepDownExplicitBounds(-4, -1, 1, 0) is "-1"
+PASS stepUpExplicitBounds(-4, -1, 1, 0) is "0"
+PASS stepUpExplicitBounds(-100, null, 3, 3) is "5"
+PASS stepDownExplicitBounds(-100, null, 3, 3) is "2"
 
 Range type

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

@@ -228 +228 @@
 shouldBe('stepUpExplicitBounds("4", "9", "0.005", "5.005", 11)', '"5.06"');
 shouldBe('stepUpExplicitBounds("4", "9", "0.005", "5.005", 12)', '"5.065"');
+shouldBe('stepUpExplicitBounds(-4, 4, 1, "")', '"1"');
+shouldBe('stepDownExplicitBounds(-4, 4, 1, "")', '"-1"');
+shouldBe('stepDownExplicitBounds(0, 4, 1, "")', '"0"');
+shouldBe('stepUpExplicitBounds(-4, 0, 1, "")', '"0"');
+shouldBe('stepDownExplicitBounds(1, 4, 1, "")', '"1"');
+shouldBe('stepUpExplicitBounds(1, 4, 1, "")', '"1"');
+shouldBe('stepDownExplicitBounds(-4, -1, 1, "")', '"-1"');
+shouldBe('stepUpExplicitBounds(-4, -1, 1, "")', '"-1"');
+shouldBe('stepUpExplicitBounds(-100, null, 3, "")', '"2"');
+shouldBe('stepDownExplicitBounds(-100, null, 3, "")', '"-1"');
+shouldBe('stepUpExplicitBounds(1, 4, 1, 0)', '"1"');
+shouldBe('stepDownExplicitBounds(1, 4, 1, 0)', '"0"');
+shouldBe('stepDownExplicitBounds(-4, -1, 1, 0)', '"-1"');
+shouldBe('stepUpExplicitBounds(-4, -1, 1, 0)', '"0"');
+shouldBe('stepUpExplicitBounds(-100, null, 3, 3)', '"5"');
+shouldBe('stepDownExplicitBounds(-100, null, 3, 3)', '"2"');
 
 debug('');

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-16  Naoki Takano  <takano.naoki@gmail.com>
+
+        Reviewed by Kent Tamura.
+
+        HTML5 Number Spinbox displays a 0 in situations where a 0 is not between the min and max.
+        https://bugs.webkit.org/show_bug.cgi?id=60871
+
+        Test: fast/forms/input-stepup-stepdown-from-renderer.html
+
+        In number input type, if the value is not a number, including empty, the currect valued is assumed 0.
+        But we have to handle it separately from the case when the value is actuall "0".
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::stepUpFromRenderer): Added cliping for default value.
+
 2011-05-16  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -1462 +1462 @@
         ExceptionCode ec;
         current = m_inputType->defaultValueForStepUp();
+        int nextDiff = step * n;
+        if (current < m_inputType->minimum() - nextDiff)
+            current = m_inputType->minimum() - nextDiff;
+        if (current > m_inputType->maximum() - nextDiff)
+            current = m_inputType->maximum() - nextDiff;
         setValueAsNumber(current, ec);
     }
@@ -1468 +1473 @@
     else {
         ExceptionCode ec;
-        if (stepMismatch(currentStringValue)) {
+        if (stepMismatch(value())) {
             ASSERT(step);
             double newValue;