Changeset 92589 in webkit

Timestamp:

Aug 8, 2011 2:16:54 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Source/WebCore: The input[type=number] element should be as wide as necessary to show the widest possible value.
​https://bugs.webkit.org/show_bug.cgi?id=60673

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

The size of input[type=number] is calculated from min/max/step attributes to show the widest possible value.
If min or max attribute is absent, the default size is used.
Also, if its css width is not auto, the width is used with priority.

If min/max/attribute is set dynamically, the size of the input[type=number] will be recalculated.

Test: fast/forms/input-number-size.html

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::parseMappedAttribute):

Added stepAttributeChanged handler.

(WebCore::HTMLInputElement::sizeShouldIncludeDecoration):

Returns true if a renderer should include decoration (e.g. inner spinbox).
Also returns the preferred size of the input.

• html/HTMLInputElement.h:
• html/InputType.cpp:

(WebCore::InputType::sizeShouldIncludeDecoration):

Same as WebCore::HTMLInputElement::sizeShouldIncludeDecoration.

(WebCore::InputType::stepAttributeChanged):

Will be called When step attribute is changed.
Sets a flag to recalculate layout.

• html/InputType.h:
• html/NumberInputType.cpp:

(WebCore::lengthBeforeDecimalPoint):

Calculates the width before the decimal point.

(WebCore::NumberInputType::sizeShouldIncludeDecoration):

Same as WebCore::HTMLInputElement::sizeShouldIncludeDecoration.
However, this will calculate the preferred size from min/max/step attribute.

(WebCore::NumberInputType::minOrMaxAttributeChanged):

Sets a flag to recalculate layout.

(WebCore::NumberInputType::stepAttributeChanged): ditto.

• html/NumberInputType.h:
• rendering/RenderTextControlSingleLine.cpp:

(WebCore::RenderTextControlSingleLine::preferredContentWidth):

Uses preferredSize instead of size.
Also, adds innerSpinButtonElement size to width if sizeShouldIncludeDecoration returns true.

LayoutTests: Added the test to check the width of input[type=number].
​https://bugs.webkit.org/show_bug.cgi?id=60673

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

• fast/forms/input-number-size-expected.txt: Added.
• fast/forms/input-number-size.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/input-number-size-expected.txt (added)
• LayoutTests/fast/forms/input-number-size.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLInputElement.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLInputElement.h (modified) (1 diff)
• Source/WebCore/html/InputType.cpp (modified) (2 diffs)
• Source/WebCore/html/InputType.h (modified) (2 diffs)
• Source/WebCore/html/NumberInputType.cpp (modified) (3 diffs)
• Source/WebCore/html/NumberInputType.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderTextControlSingleLine.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-08  Shinya Kawanaka  <shinyak@google.com>
+
+        Added the test to check the width of input[type=number].
+        https://bugs.webkit.org/show_bug.cgi?id=60673
+
+        Reviewed by Kent Tamura.
+
+        * fast/forms/input-number-size-expected.txt: Added.
+        * fast/forms/input-number-size.html: Added.
+
 2011-08-07  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-08  Shinya Kawanaka  <shinyak@google.com>
+
+        The input[type=number] element should be as wide as necessary to show the widest possible value.
+        https://bugs.webkit.org/show_bug.cgi?id=60673
+
+        Reviewed by Kent Tamura.
+
+        The size of input[type=number] is calculated from min/max/step attributes to show the widest possible value.
+        If min or max attribute is absent, the default size is used.
+        Also, if its css width is not auto, the width is used with priority.
+
+        If min/max/attribute is set dynamically, the size of the input[type=number] will be recalculated.
+
+        Test: fast/forms/input-number-size.html
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::parseMappedAttribute):
+           Added stepAttributeChanged handler.
+        (WebCore::HTMLInputElement::sizeShouldIncludeDecoration):
+           Returns true if a renderer should include decoration (e.g. inner spinbox).
+           Also returns the preferred size of the input.
+        * html/HTMLInputElement.h:
+        * html/InputType.cpp:
+        (WebCore::InputType::sizeShouldIncludeDecoration):
+           Same as WebCore::HTMLInputElement::sizeShouldIncludeDecoration.
+        (WebCore::InputType::stepAttributeChanged):
+           Will be called When step attribute is changed.
+           Sets a flag to recalculate layout.
+        * html/InputType.h:
+        * html/NumberInputType.cpp:
+        (WebCore::lengthBeforeDecimalPoint):
+           Calculates the width before the decimal point.
+        (WebCore::NumberInputType::sizeShouldIncludeDecoration):
+           Same as WebCore::HTMLInputElement::sizeShouldIncludeDecoration.
+           However, this will calculate the preferred size from min/max/step attribute.
+        (WebCore::NumberInputType::minOrMaxAttributeChanged):
+           Sets a flag to recalculate layout.
+        (WebCore::NumberInputType::stepAttributeChanged): ditto.
+        * html/NumberInputType.h:
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::preferredContentWidth):
+           Uses preferredSize instead of size.
+           Also, adds innerSpinButtonElement size to width if sizeShouldIncludeDecoration returns true.
+
 2011-08-08  Kenichi Ishibashi  <bashi@chromium.org>
 

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -51 +51 @@
 #include "LocalizedStrings.h"
 #include "MouseEvent.h"
+#include "NumberInputType.h"
 #include "Page.h"
 #include "PlatformMouseEvent.h"
@@ -805 +806 @@
         m_inputType->multipleAttributeChanged();
         setNeedsValidityCheck();
-    } else if (attr->name() == patternAttr || attr->name() == precisionAttr || attr->name() == stepAttr)
+    } else if (attr->name() == stepAttr) {
+        m_inputType->stepAttributeChanged();
+        setNeedsValidityCheck();
+    } else if (attr->name() == patternAttr || attr->name() == precisionAttr)
         setNeedsValidityCheck();
     else if (attr->name() == disabledAttr) {
@@ -993 +997 @@
 {
     return m_size;
+}
+
+bool HTMLInputElement::sizeShouldIncludeDecoration(int& preferredSize) const
+{
+    return m_inputType->sizeShouldIncludeDecoration(defaultSize, preferredSize);
 }
 

trunk/Source/WebCore/html/HTMLInputElement.h

@@ -132 +132 @@
 
     int size() const;
+    bool sizeShouldIncludeDecoration(int& preferredSize) const;
 
     void setType(const String&);

trunk/Source/WebCore/html/InputType.cpp

@@ -250 +250 @@
 }
 
+bool InputType::sizeShouldIncludeDecoration(int defaultSize, int& preferredSize) const
+{
+    preferredSize = element()->size();
+    return false;
+}
+
 bool InputType::stepMismatch(const String&, double) const
 {
@@ -454 +460 @@
 }
 
+void InputType::stepAttributeChanged()
+{
+}
+
 bool InputType::canBeSuccessfulSubmitButton()
 {

trunk/Source/WebCore/html/InputType.h

@@ -144 +144 @@
     virtual double minimum() const;
     virtual double maximum() const;
+    virtual bool sizeShouldIncludeDecoration(int defaultSize, int& preferredSize) const;
     virtual bool stepMismatch(const String&, double step) const;
     virtual double stepBase() const;
@@ -207 +208 @@
     virtual void attach();
     virtual void minOrMaxAttributeChanged();
+    virtual void stepAttributeChanged();
     virtual void altAttributeChanged();
     virtual void srcAttributeChanged();

trunk/Source/WebCore/html/NumberInputType.cpp

@@ -54 +54 @@
 static const double numberStepScaleFactor = 1.0;
 
+static unsigned lengthBeforeDecimalPoint(double value)
+{
+    // If value is negative, '-' should be counted.
+
+    double absoluteValue = fabs(value);
+    if (absoluteValue < 1)
+        return value < 0 ? 2 : 1;
+
+    unsigned length = static_cast<unsigned>(log10(floor(absoluteValue))) + 1;
+    if (value < 0)
+        length += 1;
+
+    return length;
+}
+
 PassOwnPtr<InputType> NumberInputType::create(HTMLInputElement* element)
 {
@@ -122 +137 @@
 }
 
+bool NumberInputType::sizeShouldIncludeDecoration(int defaultSize, int& preferredSize) const
+{
+    preferredSize = defaultSize;
+
+    unsigned minValueDecimalPlaces;
+    double minValueDouble;
+    String minValue = element()->fastGetAttribute(minAttr);
+    if (!parseToDoubleForNumberTypeWithDecimalPlaces(minValue, &minValueDouble, &minValueDecimalPlaces))
+        return false;
+
+    unsigned maxValueDecimalPlaces;
+    double maxValueDouble;
+    String maxValue = element()->fastGetAttribute(maxAttr);
+    if (!parseToDoubleForNumberTypeWithDecimalPlaces(maxValue, &maxValueDouble, &maxValueDecimalPlaces))
+        return false;
+
+    if (maxValueDouble < minValueDouble) {
+        maxValueDouble = minValueDouble;
+        maxValueDecimalPlaces = maxValueDecimalPlaces;
+    }
+
+    unsigned stepValueDecimalPlaces;
+    double stepValueDouble;
+    String stepValue = element()->fastGetAttribute(stepAttr);
+    if (equalIgnoringCase(stepValue, "any"))
+        return false;
+    if (!parseToDoubleForNumberTypeWithDecimalPlaces(stepValue, &stepValueDouble, &stepValueDecimalPlaces)) {
+        stepValueDouble = 1;
+        stepValueDecimalPlaces = 0;
+    }
+
+    unsigned length = lengthBeforeDecimalPoint(minValueDouble);
+    length = max(length, lengthBeforeDecimalPoint(maxValueDouble));
+    length = max(length, lengthBeforeDecimalPoint(stepValueDouble));
+
+    unsigned lengthAfterDecimalPoint = minValueDecimalPlaces;
+    lengthAfterDecimalPoint = max(lengthAfterDecimalPoint, maxValueDecimalPlaces);
+    lengthAfterDecimalPoint = max(lengthAfterDecimalPoint, stepValueDecimalPlaces);
+
+    // '.' should be counted if the value has decimal places.
+    if (lengthAfterDecimalPoint > 0)
+        length += lengthAfterDecimalPoint + 1;
+
+    preferredSize = length;
+    return true;
+}
+
 bool NumberInputType::isSteppable() const
 {
@@ -275 +337 @@
 }
 
+void NumberInputType::minOrMaxAttributeChanged()
+{
+    InputType::minOrMaxAttributeChanged();
+
+    if (element()->renderer())
+        element()->renderer()->setNeedsLayoutAndPrefWidthsRecalc();
+}
+
+void NumberInputType::stepAttributeChanged()
+{
+    InputType::stepAttributeChanged();
+
+    if (element()->renderer())
+        element()->renderer()->setNeedsLayoutAndPrefWidthsRecalc();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/html/NumberInputType.h

@@ -52 +52 @@
     virtual double minimum() const;
     virtual double maximum() const;
+    virtual bool sizeShouldIncludeDecoration(int defaultSize, int& preferredSize) const;
     virtual bool isSteppable() const;
     virtual bool stepMismatch(const String&, double) const;
@@ -73 +74 @@
     virtual bool supportsPlaceholder() const;
     virtual bool isNumberField() const;
+    virtual void minOrMaxAttributeChanged();
+    virtual void stepAttributeChanged();
 };
 

trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -390 +390 @@
     return RenderTextControl::getAvgCharWidth(family);
 }
-    
+
 int RenderTextControlSingleLine::preferredContentWidth(float charWidth) const
 {
-    int factor = inputElement()->size();
+    int factor;
+    bool includesDecoration = inputElement()->sizeShouldIncludeDecoration(factor);
     if (factor <= 0)
         factor = 20;
@@ -423 +424 @@
         result += cancelRenderer->borderLeft() + cancelRenderer->borderRight() +
                   cancelRenderer->paddingLeft() + cancelRenderer->paddingRight();
+
+    if (includesDecoration) {
+        HTMLElement* spinButton = innerSpinButtonElement();
+        if (RenderBox* spinRenderer = spinButton ? spinButton->renderBox() : 0) {
+            result += spinRenderer->borderLeft() + spinRenderer->borderRight() +
+                  spinRenderer->paddingLeft() + spinRenderer->paddingRight();
+            // Since the width of spinRenderer is not calculated yet, spinRenderer->width() returns 0.
+            // So computedStyle()->width() is used instead.
+            result += spinButton->computedStyle()->width().value();
+        }
+    }
 
 #if ENABLE(INPUT_SPEECH)