Changeset 197261 in webkit for trunk/Source/JavaScriptCore/runtime/IntlObject.h

Timestamp:

Feb 27, 2016, 4:36:01 PM (9 years ago)

Author:

[email protected]

Message:

Intl.Collator uses POSIX locale (detected by js/intl-collator.html on iOS Simulator)
​https://bugs.webkit.org/show_bug.cgi?id=152448

Patch by Andy VanWagoner <​[email protected]> on 2016-02-27
Reviewed by Darin Adler.

Source/JavaScriptCore:

Add defaultLanguage to the globalObjectMethodTable and use it for the
default locale in Intl object initializations. Fall back to ICU default
locale only if the defaultLanguage function is null, or returns an
empty string.

• jsc.cpp:
• runtime/IntlCollator.cpp:

(JSC::IntlCollator::initializeCollator):

• runtime/IntlDateTimeFormat.cpp:

(JSC::IntlDateTimeFormat::initializeDateTimeFormat):

• runtime/IntlNumberFormat.cpp:

(JSC::IntlNumberFormat::initializeNumberFormat):

• runtime/IntlObject.cpp:

(JSC::defaultLocale):
(JSC::lookupMatcher):
(JSC::bestFitMatcher):
(JSC::resolveLocale):

• runtime/IntlObject.h:
• runtime/JSGlobalObject.cpp:
• runtime/JSGlobalObject.h:
• runtime/StringPrototype.cpp:

(JSC::toLocaleCase):

Source/WebCore:

Pass defaultLanguage from Language.h to the globalObjectMethodTable to
ensure Intl objects can be initialized with the correct default locale.

• bindings/js/JSDOMWindowBase.cpp:
• bindings/js/JSWorkerGlobalScopeBase.cpp:

LayoutTests:

Add tests for default locale in test runner to be en-US.

• js/intl-collator-expected.txt:
• js/intl-datetimeformat-expected.txt:
• js/intl-numberformat-expected.txt:
• js/script-tests/intl-collator.js:
• js/script-tests/intl-datetimeformat.js:
• js/script-tests/intl-numberformat.js:

File:

• trunk/Source/JavaScriptCore/runtime/IntlObject.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/IntlObject.h

@@ -58 +58 @@
 };
 
-String defaultLocale();
+String defaultLocale(ExecState&);
 void convertICULocaleToBCP47LanguageTag(String& locale);
 bool intlBooleanOption(ExecState&, JSValue options, PropertyName, bool& usesFallback);
@@ -64 +64 @@
 unsigned intlNumberOption(ExecState&, JSValue options, PropertyName, unsigned minimum, unsigned maximum, unsigned fallback);
 Vector<String> canonicalizeLocaleList(ExecState&, JSValue locales);
-HashMap<String, String> resolveLocale(const HashSet<String>& availableLocales, const Vector<String>& requestedLocales, const HashMap<String, String>& options, const char* const relevantExtensionKeys[], size_t relevantExtensionKeyCount, Vector<String> (*localeData)(const String&, size_t));
+HashMap<String, String> resolveLocale(ExecState&, const HashSet<String>& availableLocales, const Vector<String>& requestedLocales, const HashMap<String, String>& options, const char* const relevantExtensionKeys[], size_t relevantExtensionKeyCount, Vector<String> (*localeData)(const String&, size_t));
 JSValue supportedLocales(ExecState&, const HashSet<String>& availableLocales, const Vector<String>& requestedLocales, JSValue options);
 String removeUnicodeLocaleExtension(const String& locale);