Changeset 278697 in webkit

Timestamp:

Jun 10, 2021 1:06:59 AM (14 months ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Ignore Intl.NumberFormat feature options when linked-ICU is old
​https://bugs.webkit.org/show_bug.cgi?id=226861
rdar://77393100

Reviewed by Ross Kirsling.

Let's just ignore the option when Intl.NumberFormat features cannot be implemented since the linked ICU is old.
There is no way not to expose these features since Intl.NumberFormat's these changes are additional ones and Intl.NumberFormat existed before.

• runtime/IntlNumberFormat.cpp:

(JSC::IntlNumberFormat::initializeNumberFormat):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/IntlNumberFormat.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-06-10  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Ignore Intl.NumberFormat feature options when linked-ICU is old
+        https://bugs.webkit.org/show_bug.cgi?id=226861
+        rdar://77393100
+
+        Reviewed by Ross Kirsling.
+
+        Let's just ignore the option when Intl.NumberFormat features cannot be implemented since the linked ICU is old.
+        There is no way not to expose these features since Intl.NumberFormat's these changes are additional ones and Intl.NumberFormat existed before.
+
+        * runtime/IntlNumberFormat.cpp:
+        (JSC::IntlNumberFormat::initializeNumberFormat):
+
 2021-06-09  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/JavaScriptCore/runtime/IntlNumberFormat.cpp

@@ -546 +546 @@
             break;
         case CurrencyDisplay::NarrowSymbol:
-            throwTypeError(globalObject, scope, "Failed to initialize NumberFormat since used feature is not supported in the linked ICU version"_s);
-            return;
+            style = UNUM_CURRENCY; // Use the same option to "symbol" since linked-ICU does not support it.
+            break;
         case CurrencyDisplay::Name:
             style = UNUM_CURRENCY_PLURAL;
@@ -556 +556 @@
             break;
         case CurrencySign::Accounting:
-            throwTypeError(globalObject, scope, "Failed to initialize NumberFormat since used feature is not supported in the linked ICU version"_s);
-            return;
+            // Ignore this case since linked ICU does not support it.
+            break;
         }
         break;
     case Style::Unit:
-        throwTypeError(globalObject, scope, "Failed to initialize NumberFormat since used feature is not supported in the linked ICU version"_s);
-        return;
+        // Ignore this case since linked ICU does not support it.
+        break;
     }
 
@@ -571 +571 @@
     case IntlNotation::Engineering:
     case IntlNotation::Compact:
-        throwTypeError(globalObject, scope, "Failed to initialize NumberFormat since used feature is not supported in the linked ICU version"_s);
-        return;
+        // Ignore this case since linked ICU does not support it.
+        break;
     }
 
@@ -581 +581 @@
     case SignDisplay::Always:
     case SignDisplay::ExceptZero:
-        throwTypeError(globalObject, scope, "Failed to initialize NumberFormat since used feature is not supported in the linked ICU version"_s);
-        return;
+        // Ignore this case since linked ICU does not support it.
+        break;
     }
 
@@ -612 +612 @@
         break;
     case IntlRoundingType::CompactRounding:
-        throwTypeError(globalObject, scope, "Failed to initialize NumberFormat since used feature is not supported in the linked ICU version"_s);
-        return;
+        // Ignore this case since linked ICU does not support it.
+        break;
     }
     unum_setAttribute(m_numberFormat.get(), UNUM_GROUPING_USED, m_useGrouping);