Changeset 107196 in webkit

Timestamp:

Feb 9, 2012 1:33:54 AM (12 years ago)

Author:

tkent@chromium.org

Message:

Do not localize numbers in scientific notation
​https://bugs.webkit.org/show_bug.cgi?id=78208

Reviewed by Hajime Morita.

.:

• ManualTests/input-number-localization.html: Updated for scientific notation.

Source/WebCore:

For a preparation of fixing ​http://wkb.ug/62939, we stop supporting
localized numbers in scientific notation in <input type=number>.

We're going to change number localization processing so that it replaces
letters one by one. It will be very hard to support scientific notation.

• html/NumberInputType.cpp:

(WebCore::isE): A helper functio for String::find() to detect scientific notation.
(WebCore::NumberInputType::visibleValue): Avoid localization for scientific notation.
(WebCore::NumberInputType::convertFromVisibleValue): ditto.
(WebCore::NumberInputType::isAcceptableValue):
Use convertFromVisibleValue, also stop accepting a standard format as a fallback.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• ManualTests/input-number-localization.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/NumberInputType.cpp (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2012-02-09  Kent Tamura  <tkent@chromium.org>
+
+        Do not localize numbers in scientific notation
+        https://bugs.webkit.org/show_bug.cgi?id=78208
+
+        Reviewed by Hajime Morita.
+
+        * ManualTests/input-number-localization.html: Updated for scientific notation.
+
 2012-02-09  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/ManualTests/input-number-localization.html

@@ -13 +13 @@
 <div id="console"></div>
 
-<p>Output test: The following text field should have a localized representation for "-1234.5678".
+<p>Output test 1: The following text field should have a localized representation for "-1234.5678".
 e.g. "-1234.5678" for en_US locale, "-1234,5678" for fr_FR locale. The thousand separator is
 currently off.</p>
 <div><input type=number value="-1234.5678" step=any></div>
 
-<p>Input test: Type a localized representation of a number (e.g. -1,234.5678 for en_US locale,
+<p>Output test 2: The following text field should have "-1234.5678E+12" in any locale.
+</p>
+<div><input type=number value="-1234.5678E+12" step=any></div>
+
+<p>Input test 1: Type a localized representation of a number (e.g. -1,234.5678 for en_US locale,
 -1.234,5678 for fr_FR locale) into the following text field.
 You'll see an equivalent number in the standard format on the bottom of the text field.</p>
+<p>Input test 2: Type a number in the scientific notation (e.g. 0.1234e-10.)
+You'll see the same number string on the bottom of the text field.</p>
 <div><input type=number id=target step=any oninput="handleInput()"></div>
 <div>Standard format: <output id=output></output></div>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-09  Kent Tamura  <tkent@chromium.org>
+
+        Do not localize numbers in scientific notation
+        https://bugs.webkit.org/show_bug.cgi?id=78208
+
+        Reviewed by Hajime Morita.
+
+        For a preparation of fixing http://wkb.ug/62939, we stop supporting
+        localized numbers in scientific notation in <input type=number>.
+
+        We're going to change number localization processing so that it replaces
+        letters one by one. It will be very hard to support scientific notation.
+
+        * html/NumberInputType.cpp:
+        (WebCore::isE): A helper functio for String::find() to detect scientific notation.
+        (WebCore::NumberInputType::visibleValue): Avoid localization for scientific notation.
+        (WebCore::NumberInputType::convertFromVisibleValue): ditto.
+        (WebCore::NumberInputType::isAcceptableValue):
+        Use convertFromVisibleValue, also stop accepting a standard format as a fallback.
+
 2012-02-09  Leo Yang  <leo.yang@torchmobile.com.cn>
 

trunk/Source/WebCore/html/NumberInputType.cpp

@@ -284 +284 @@
 }
 
+static bool isE(UChar ch)
+{
+    return ch == 'e' || ch == 'E';
+}
+
 String NumberInputType::visibleValue() const
 {
     String currentValue = element()->value();
     if (currentValue.isEmpty())
+        return currentValue;
+    // We don't localize scientific notations.
+    if (currentValue.find(isE) != notFound)
         return currentValue;
     // FIXME: The following three lines should be removed when we
@@ -301 +309 @@
     if (visibleValue.isEmpty())
         return visibleValue;
+    // We don't localize scientific notations.
+    if (visibleValue.find(isE) != notFound)
+        return visibleValue;
     return convertFromLocalizedNumber(visibleValue);
 }
@@ -306 +317 @@
 bool NumberInputType::isAcceptableValue(const String& proposedValue)
 {
-    return proposedValue.isEmpty() || parseToDoubleForNumberType(convertFromLocalizedNumber(proposedValue), 0) || parseToDoubleForNumberType(proposedValue, 0);
+    String standardValue = convertFromVisibleValue(proposedValue);
+    return standardValue.isEmpty() || parseToDoubleForNumberType(standardValue, 0);
 }