Changeset 81649 in webkit

Timestamp:

Mar 22, 2011 12:43:21 AM (13 years ago)

Author:

tkent@chromium.org

Message:

2011-03-22 Kent Tamura <​tkent@chromium.org>

Reviewed by Eric Seidel.

REGRESSION(r80096): Number type input unexpectedly rounds fractional values
​https://bugs.webkit.org/show_bug.cgi?id=56367

Introduce clampToInteger(unsigned).

• wtf/MathExtras.h: (clampToInteger): Added.

2011-03-22 Kent Tamura <​tkent@chromium.org>

Reviewed by Eric Seidel.

REGRESSION(r80096): Number type input unexpectedly rounds fractional values
​https://bugs.webkit.org/show_bug.cgi?id=56367

Because the default value of the maximum fractional digits of NSNumberFormatter
and ICU NumberFormat is 3, the value 0.55555 is rounded to 0.556 in a
localized representation. This bug affects only in Mac and Chromium.

To fix this bug,

• Add "maximum fractional digits" parameter to formatLocalizedNumber(), and
• NumberInputType::visibleValue uses parseToDoubleForNumberTypeWithDecimalPlaces() instead of parseToDoubleForNumberType().

No automated tests because the behavior is locale-dependent. This change
updates a manual test.

• html/NumberInputType.cpp: (WebCore::NumberInputType::visibleValue): Use parseToDoubleForNumberTypeWithDecimalPlaces() and passing fractional part length to formatLocalizedNumber().
• manual-tests/input-number-localization.html: Update the test to cover this change.
• platform/text/LocalizedNumber.h: Add a parameter to formatLocalizedNumber().
• platform/text/LocalizedNumberICU.cpp: (WebCore::formatLocalizedNumber): Call setMaximumFractionalDigits().
• platform/text/LocalizedNumberNone.cpp: (WebCore::formatLocalizedNumber):
• platform/text/mac/LocalizedNumberMac.mm: (WebCore::formatLocalizedNumber): Call setMaximumFractionalDigits().

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/MathExtras.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/NumberInputType.cpp (modified) (1 diff)
• WebCore/manual-tests/input-number-localization.html (modified) (1 diff)
• WebCore/platform/text/LocalizedNumber.h (modified) (1 diff)
• WebCore/platform/text/LocalizedNumberICU.cpp (modified) (3 diffs)
• WebCore/platform/text/LocalizedNumberNone.cpp (modified) (1 diff)
• WebCore/platform/text/mac/LocalizedNumberMac.mm (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-03-22  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        REGRESSION(r80096): Number type input unexpectedly rounds fractional values
+        https://bugs.webkit.org/show_bug.cgi?id=56367
+
+        Introduce clampToInteger(unsigned).
+        
+        * wtf/MathExtras.h:
+        (clampToInteger): Added.
+
 2011-03-21  Adam Barth  <abarth@webkit.org>
 

trunk/Source/JavaScriptCore/wtf/MathExtras.h

@@ -234 +234 @@
 }
 
+inline int clampToInteger(unsigned value)
+{
+    return static_cast<int>(std::min(value, static_cast<unsigned>(std::numeric_limits<int>::max())));
+}
+
 #if !COMPILER(MSVC) && !COMPILER(WINSCW) && !(COMPILER(RVCT) && (OS(SYMBIAN) || PLATFORM(BREWMP)))
 using std::isfinite;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-22  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        REGRESSION(r80096): Number type input unexpectedly rounds fractional values
+        https://bugs.webkit.org/show_bug.cgi?id=56367
+        
+        Because the default value of the maximum fractional digits of NSNumberFormatter
+        and ICU NumberFormat is 3, the value 0.55555 is rounded to 0.556 in a
+        localized representation. This bug affects only in Mac and Chromium.
+
+        To fix this bug,
+         - Add "maximum fractional digits" parameter to formatLocalizedNumber(), and
+         - NumberInputType::visibleValue uses parseToDoubleForNumberTypeWithDecimalPlaces()
+          instead of parseToDoubleForNumberType().
+
+        No automated tests because the behavior is locale-dependent. This change
+        updates a manual test.
+
+        * html/NumberInputType.cpp:
+        (WebCore::NumberInputType::visibleValue):
+          Use parseToDoubleForNumberTypeWithDecimalPlaces() and passing fractional
+          part length to formatLocalizedNumber().
+        * manual-tests/input-number-localization.html:
+          Update the test to cover this change.
+        * platform/text/LocalizedNumber.h: Add a parameter to formatLocalizedNumber().
+        * platform/text/LocalizedNumberICU.cpp:
+        (WebCore::formatLocalizedNumber): Call setMaximumFractionalDigits().
+        * platform/text/LocalizedNumberNone.cpp:
+        (WebCore::formatLocalizedNumber):
+        * platform/text/mac/LocalizedNumberMac.mm:
+        (WebCore::formatLocalizedNumber): Call setMaximumFractionalDigits().
+
 2011-03-21  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/html/NumberInputType.cpp

@@ -224 +224 @@
         return currentValue;
     double doubleValue = numeric_limits<double>::quiet_NaN();
-    parseToDoubleForNumberType(currentValue, &doubleValue);
-    String localized = formatLocalizedNumber(doubleValue);
+    unsigned decimalPlace;
+    parseToDoubleForNumberTypeWithDecimalPlaces(currentValue, &doubleValue, &decimalPlace);
+    String localized = formatLocalizedNumber(doubleValue, decimalPlace);
     return localized.isEmpty() ? currentValue : localized;
 }

trunk/Source/WebCore/manual-tests/input-number-localization.html

@@ -13 +13 @@
 <div id="console"></div>
 
-<p>Output test: The following text field should have a localized representation for "-1234.56".
-e.g. "-1,234.56" for en_US locale, "-1.234,56" for fr_FR locale.</p>
-<div><input type=number value="-1234.56" step=any></div>
+<p>Output test: The following text field should have a localized representation for "-1234.5678".
+e.g. "-1,234.5678" for en_US locale, "-1.234,5678" for fr_FR locale.</p>
+<div><input type=number value="-1234.5678" step=any></div>
 
 <p>Input test: Type a localized representation of a number into the following text field.

trunk/Source/WebCore/platform/text/LocalizedNumber.h

@@ -48 +48 @@
 // numbers or the input value is NaN or Infinitiy, the function should
 // return an empty string.
-String formatLocalizedNumber(double);
+// fractionDigits is the maximum length of the fractional parts of the
+// resultant string.
+String formatLocalizedNumber(double, unsigned fractionDigits);
 
 } // namespace WebCore

trunk/Source/WebCore/platform/text/LocalizedNumberICU.cpp

@@ -35 +35 @@
 #include <unicode/numfmt.h>
 #include <unicode/parsepos.h>
+#include <wtf/MathExtras.h>
 #include <wtf/PassOwnPtr.h>
 
@@ -74 +75 @@
 }
 
-String formatLocalizedNumber(double number)
+String formatLocalizedNumber(double number, unsigned fractionDigits)
 {
     NumberFormat* formatter = numberFormatter();
@@ -80 +81 @@
         return String();
     UnicodeString result;
+    formatter->setMaximumFractionDigits(clampToInteger(fractionDigits));
     formatter->format(number, result);
     return String(result.getBuffer(), result.length());

trunk/Source/WebCore/platform/text/LocalizedNumberNone.cpp

@@ -43 +43 @@
 }
 
-String formatLocalizedNumber(double)
+String formatLocalizedNumber(double, unsigned)
 {
     return String();

trunk/Source/WebCore/platform/text/mac/LocalizedNumberMac.mm

@@ -66 +66 @@
 }
 
-String formatLocalizedNumber(double inputNumber)
+String formatLocalizedNumber(double inputNumber, unsigned fractionDigits)
 {
     RetainPtr<NSNumber> number(AdoptNS, [[NSNumber alloc] initWithDouble:inputNumber]);
-    return String([numberFormatter() stringFromNumber:number.get()]);
+    RetainPtr<NSNumberFormatter> formatter = numberFormatter();
+    [formatter.get() setMaximumFractionDigits:fractionDigits];
+    return String([formatter.get() stringFromNumber:number.get()]);
 }