Changeset 51159 in webkit

Timestamp:

Nov 18, 2009 5:48:52 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-18 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Add tests for ValidityState.stepMismatch.
​https://bugs.webkit.org/show_bug.cgi?id=31331

• fast/forms/ValidityState-stepMismatch-number-expected.txt: Added.
• fast/forms/ValidityState-stepMismatch-number.html: Added.
• fast/forms/ValidityState-stepMismatch-range-expected.txt: Added.
• fast/forms/ValidityState-stepMismatch-range.html: Added.
• fast/forms/ValidityState-stepMismatch-unsupported-expected.txt: Added.
• fast/forms/ValidityState-stepMismatch-unsupported.html: Added.
• fast/forms/input-step-expected.txt: Added.
• fast/forms/input-step.html: Added.
• fast/forms/script-tests/ValidityState-stepMismatch-number.js: Added.
• fast/forms/script-tests/ValidityState-stepMismatch-range.js: Added.
• fast/forms/script-tests/ValidityState-stepMismatch-unsupported.js: Added.
• fast/forms/script-tests/input-step.js: Added.

2009-11-18 Kent Tamura <​tkent@chromium.org>

Reviewed by Darin Adler.

Support for step attribute and ValidityStae.stepMismatch for
type=number and range. stepMismatch will be false if the
difference between the current value and a multiple of the step
value is very small.

Change the behavior of RenderSlider so that it always has a value
rounded to the step attribute value.

​https://bugs.webkit.org/show_bug.cgi?id=31331

Tests: fast/forms/ValidityState-stepMismatch-number.html

fast/forms/ValidityState-stepMismatch-range.html
fast/forms/ValidityState-stepMismatch-unsupported.html
fast/forms/input-step.html

• html/HTMLAttributeNames.in: Add "step".
• html/HTMLInputElement.cpp: (WebCore::HTMLInputElement::stepMismatch): (WebCore::HTMLInputElement::getStepParameters): (WebCore::HTMLInputElement::getAllowedValueStep):
• html/HTMLInputElement.h:
• html/HTMLInputElement.idl: Add "step".
• html/ValidityState.cpp: (WebCore::ValidityState::stepMismatch): Forward to HTMLInputElement::stepMismatch().
• html/ValidityState.h:
• rendering/RenderSlider.cpp: (WebCore::SliderRange::SliderRange): (WebCore::SliderRange::clampValue):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/ValidityState-stepMismatch-number-expected.txt (added)
• LayoutTests/fast/forms/ValidityState-stepMismatch-number.html (added)
• LayoutTests/fast/forms/ValidityState-stepMismatch-range-expected.txt (added)
• LayoutTests/fast/forms/ValidityState-stepMismatch-range.html (added)
• LayoutTests/fast/forms/ValidityState-stepMismatch-unsupported-expected.txt (added)
• LayoutTests/fast/forms/ValidityState-stepMismatch-unsupported.html (added)
• LayoutTests/fast/forms/input-step-expected.txt (added)
• LayoutTests/fast/forms/input-step.html (added)
• LayoutTests/fast/forms/script-tests/ValidityState-stepMismatch-number.js (added)
• LayoutTests/fast/forms/script-tests/ValidityState-stepMismatch-range.js (added)
• LayoutTests/fast/forms/script-tests/ValidityState-stepMismatch-unsupported.js (added)
• LayoutTests/fast/forms/script-tests/input-step.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLAttributeNames.in (modified) (1 diff)
• WebCore/html/HTMLInputElement.cpp (modified) (2 diffs)
• WebCore/html/HTMLInputElement.h (modified) (2 diffs)
• WebCore/html/HTMLInputElement.idl (modified) (2 diffs)
• WebCore/html/ValidityState.cpp (modified) (1 diff)
• WebCore/html/ValidityState.h (modified) (1 diff)
• WebCore/rendering/RenderSlider.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-11-18  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Add tests for ValidityState.stepMismatch.
+        https://bugs.webkit.org/show_bug.cgi?id=31331
+
+        * fast/forms/ValidityState-stepMismatch-number-expected.txt: Added.
+        * fast/forms/ValidityState-stepMismatch-number.html: Added.
+        * fast/forms/ValidityState-stepMismatch-range-expected.txt: Added.
+        * fast/forms/ValidityState-stepMismatch-range.html: Added.
+        * fast/forms/ValidityState-stepMismatch-unsupported-expected.txt: Added.
+        * fast/forms/ValidityState-stepMismatch-unsupported.html: Added.
+        * fast/forms/input-step-expected.txt: Added.
+        * fast/forms/input-step.html: Added.
+        * fast/forms/script-tests/ValidityState-stepMismatch-number.js: Added.
+        * fast/forms/script-tests/ValidityState-stepMismatch-range.js: Added.
+        * fast/forms/script-tests/ValidityState-stepMismatch-unsupported.js: Added.
+        * fast/forms/script-tests/input-step.js: Added.
+
 2009-11-18  Shu Chang  <Chang.Shu@nokia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-18  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Support for step attribute and ValidityStae.stepMismatch for
+        type=number and range.  stepMismatch will be false if the
+        difference between the current value and a multiple of the step
+        value is very small.
+
+        Change the behavior of RenderSlider so that it always has a value
+        rounded to the step attribute value.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31331
+
+        Tests: fast/forms/ValidityState-stepMismatch-number.html
+               fast/forms/ValidityState-stepMismatch-range.html
+               fast/forms/ValidityState-stepMismatch-unsupported.html
+               fast/forms/input-step.html
+
+        * html/HTMLAttributeNames.in: Add "step".
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::stepMismatch):
+        (WebCore::HTMLInputElement::getStepParameters):
+        (WebCore::HTMLInputElement::getAllowedValueStep):
+        * html/HTMLInputElement.h:
+        * html/HTMLInputElement.idl: Add "step".
+        * html/ValidityState.cpp:
+        (WebCore::ValidityState::stepMismatch): Forward to HTMLInputElement::stepMismatch().
+        * html/ValidityState.h:
+        * rendering/RenderSlider.cpp:
+        (WebCore::SliderRange::SliderRange):
+        (WebCore::SliderRange::clampValue):
+
 2009-11-18  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebCore/html/HTMLAttributeNames.in

@@ -236 +236 @@
 standby
 start
+step
 style
 summary

trunk/WebCore/html/HTMLInputElement.cpp

@@ -74 +74 @@
 const int maxSavedResults = 256;
 
+// Constant values for getAllowedValueStep().
+static const double numberDefaultStep = 1.0;
+static const double numberStepScaleFactor = 1.0;
+
 HTMLInputElement::HTMLInputElement(const QualifiedName& tagName, Document* doc, HTMLFormElement* f)
     : HTMLTextFormControlElement(tagName, doc, f)
@@ -307 +311 @@
     }
     return max;
+}
+
+bool HTMLInputElement::stepMismatch() const
+{
+    double step;
+    if (!getAllowedValueStep(&step))
+        return false;
+    if (inputType() == NUMBER) {
+        double doubleValue;
+        if (!formStringToDouble(value(), &doubleValue))
+            return false;
+        double stepBase = 0.0;
+        formStringToDouble(getAttribute(minAttr), &stepBase);
+        doubleValue = fabs(doubleValue - stepBase);
+        if (isinf(doubleValue))
+            return false;
+        // double's fractional part size is DBL_MAN_DIG-bit.  If the current
+        // value is greater than step*2^DBL_MANT_DIG, the following fmod() makes
+        // no sense.
+        if (doubleValue / pow(2, DBL_MANT_DIG) > step)
+            return false;
+        double remainder = fmod(doubleValue, step);
+        // Accepts errors in lower 7-bit.
+        double acceptableError = step / pow(2, DBL_MANT_DIG - 7);
+        return acceptableError < remainder && remainder < (step - acceptableError);
+    }
+    // Non-RANGE types should be rejected by getAllowedValueStep().
+    ASSERT(inputType() == RANGE);
+    // stepMismatch doesn't occur for RANGE. RenderSlider guarantees the
+    // value matches to step.
+    return false;
+}
+
+bool HTMLInputElement::getStepParameters(double* defaultStep, double* stepScaleFactor) const
+{
+    ASSERT(defaultStep);
+    ASSERT(stepScaleFactor);
+    switch (inputType()) {
+    case NUMBER:
+    case RANGE:
+        *defaultStep = numberDefaultStep;
+        *stepScaleFactor = numberStepScaleFactor;
+        return true;
+    case DATE:
+    case DATETIME:
+    case DATETIMELOCAL:
+    case MONTH:
+    case TIME:
+    case WEEK:
+        // FIXME: Implement for these types.
+        return false;
+    case BUTTON:
+    case CHECKBOX:
+    case COLOR:
+    case EMAIL:
+    case FILE:
+    case HIDDEN:
+    case IMAGE:
+    case ISINDEX:
+    case PASSWORD:
+    case RADIO:
+    case RESET:
+    case SEARCH:
+    case SUBMIT:
+    case TELEPHONE:
+    case TEXT:
+    case URL:
+        return false;
+    }
+    ASSERT_NOT_REACHED();
+    return false;
+}
+
+bool HTMLInputElement::getAllowedValueStep(double* step) const
+{
+    ASSERT(step);
+    double defaultStep;
+    double stepScaleFactor;
+    if (!getStepParameters(&defaultStep, &stepScaleFactor))
+        return false;
+    const AtomicString& stepString = getAttribute(stepAttr);
+    if (stepString.isEmpty()) {
+        *step = defaultStep * stepScaleFactor;
+        return true;
+    }
+    if (equalIgnoringCase(stepString, "any"))
+        return false;
+    double parsed;
+    if (!formStringToDouble(stepString, &parsed) || parsed <= 0.0) {
+        *step = defaultStep * stepScaleFactor;
+        return true;
+    }
+    *step = parsed * stepScaleFactor;
+    return true;
 }
 

trunk/WebCore/html/HTMLInputElement.h

@@ -111 +111 @@
     // This always returns a value which is <= rangeMinimum().
     double rangeMaximum() const;
+    // Sets the "allowed value step" defined in the HTML spec to the specified double pointer.
+    // Returns false if there is no "allowed value step."
+    bool getAllowedValueStep(double*) const;
+    // For ValidityState.
+    bool stepMismatch() const;
 
     bool isTextButton() const { return m_type == SUBMIT || m_type == RESET || m_type == BUTTON; }
@@ -266 +271 @@
 
     PassRefPtr<HTMLFormElement> createTemporaryFormForIsIndex();
-
+    // Helper for getAllowedValueStep();
+    bool getStepParameters(double* defaultStep, double* stepScaleFactor) const;
 #if ENABLE(DATALIST)
     HTMLDataListElement* dataList() const;

trunk/WebCore/html/HTMLInputElement.idl

@@ -64 +64 @@
 #endif
                  attribute [ConvertNullToNullString] DOMString src;
+                 attribute [Reflect] DOMString step;
                  attribute [ConvertNullToNullString, JSCCustomGetter] DOMString type; // readonly dropped as part of DOM level 2
                  attribute [ConvertNullToNullString] DOMString useMap;
@@ -70 +71 @@
         readonly attribute HTMLOptionElement selectedOption;
 #endif
+
         readonly attribute boolean         willValidate;
         boolean            checkValidity();

trunk/WebCore/html/ValidityState.cpp

@@ -94 +94 @@
 }
 
+bool ValidityState::stepMismatch()
+{
+    if (!control()->hasTagName(inputTag))
+        return false;
+    return static_cast<HTMLInputElement*>(control())->stepMismatch();
+}
+
 bool ValidityState::valid()
 {

trunk/WebCore/html/ValidityState.h

@@ -47 +47 @@
         bool rangeUnderflow();
         bool rangeOverflow();
-        bool stepMismatch() { return false; }
+        bool stepMismatch();
         bool customError() { return !m_customErrorMessage.isEmpty(); }
         bool valid();

trunk/WebCore/rendering/RenderSlider.cpp

@@ -49 +49 @@
 // and could be put with HTMLInputElement (possibly with a new name) instead of here.
 struct SliderRange {
-    bool isIntegral;
+    bool hasStep;
+    double step;
     double minimum;
     double maximum;  // maximum must be >= minimum.
@@ -76 +77 @@
 SliderRange::SliderRange(HTMLInputElement* element)
 {
-    // FIXME: What's the right way to handle an integral range with non-integral minimum and maximum?
-    // Currently values are guaranteed to be integral but could be outside the range in that case.
-
-    isIntegral = !equalIgnoringCase(element->getAttribute(precisionAttr), "float");
+    if (element->hasAttribute(precisionAttr)) {
+        step = 1.0;
+        hasStep = !equalIgnoringCase(element->getAttribute(precisionAttr), "float");
+    } else
+        hasStep = element->getAllowedValueStep(&step);
 
     maximum = element->rangeMaximum();
@@ -88 +90 @@
 {
     double clampedValue = max(minimum, min(value, maximum));
-    return isIntegral ? round(clampedValue) : clampedValue;
+    if (!hasStep)
+        return clampedValue;
+    // Rounds clampedValue to minimum + N * step.
+    clampedValue = minimum + round((clampedValue - minimum) / step) * step;
+    if (clampedValue > maximum)
+       clampedValue -= step;
+    ASSERT(clampedValue >= minimum);
+    ASSERT(clampedValue <= maximum);
+    return clampedValue;
 }