Use ICU case conversion/transliterator for case conversion behind a flag

src/js/i18n.js

Index: src/js/i18n.js
diff --git a/src/js/i18n.js b/src/js/i18n.js
index 011b7489af925292d841e00525d93e96600f9366..6fb2114bc584f84b0ca857400166c7cfd9b722f3 100644
--- a/src/js/i18n.js
+++ b/src/js/i18n.js
@@ -142,6 +142,13 @@ var AVAILABLE_LOCALES = {
  */
 var DEFAULT_ICU_LOCALE = UNDEFINED;
 
+function GetDefaultICULocaleJS() {
+  if (IS_UNDEFINED(DEFAULT_ICU_LOCALE)) {
+    DEFAULT_ICU_LOCALE = %GetDefaultICULocale();
+  }
+  return DEFAULT_ICU_LOCALE;
+}
+
 /**
  * Unicode extension regular expression.
  */
@@ -446,11 +453,7 @@ function lookupMatcher(service, requestedLocales) {
   }
 
   // Didn't find a match, return default.
-  if (IS_UNDEFINED(DEFAULT_ICU_LOCALE)) {
-    DEFAULT_ICU_LOCALE = %GetDefaultICULocale();
-  }
-
-  return {'locale': DEFAULT_ICU_LOCALE, 'extension': '', 'position': -1};
+  return {'locale': GetDefaultICULocaleJS(), 'extension': '', 'position': -1};
 }
 
 
@@ -720,21 +723,23 @@ function toTitleCaseTimezoneLocation(location) {
  */
 function canonicalizeLanguageTag(localeID) {
   // null is typeof 'object' so we have to do extra check.
-  if (typeof localeID !== 'string' && typeof localeID !== 'object' ||
+  if ((!IS_STRING(localeID) && !IS_RECEIVER(localeID)) ||
       IS_NULL(localeID)) {
     throw MakeTypeError(kLanguageID);
   }
 
+  // Optimize for the most common case; a language code alone in
+  // the canonical form/lowercase (e.g. "en", "fil").
+  if (IS_STRING(localeID) &&
+      !IS_NULL(InternalRegExpMatch(/^[a-z]{2,3}$/, localeID)))

[Yang, 2016/04/29 07:38:47]

brackets

[jungshik at Google, 2016/04/29 18:03:23]

Done.

+    return localeID;
+
   var localeString = GlobalString(localeID);
 
   if (isValidLanguageTag(localeString) === false) {
     throw MakeRangeError(kInvalidLanguageTag, localeString);
   }
 
-  // This call will strip -kn but not -kn-true extensions.
-  // ICU bug filled - http://bugs.icu-project.org/trac/ticket/9265.
-  // TODO(cira): check if -u-kn-true-kc-true-kh-true still throws after
-  // upgrade to ICU 4.9.
   var tag = %CanonicalizeLanguageTag(localeString);
   if (tag === 'invalid-tag') {
     throw MakeRangeError(kInvalidLanguageTag, localeString);
@@ -1990,6 +1995,37 @@ function cachedOrNewService(service, locales, options, defaults) {
   return new savedObjects[service](locales, useOptions);
 }
 
+function LocaleConvertCase(s, locales, isToUpper) {
+  // ECMA 402 section 13.1.2 steps 1 through 12.
+  var language;
+  // Optimize for the most common two cases. initializeLocaleList() can handle
+  // them as well, but it's rather slow accounting for over 60% of
+  // toLocale{U,L}Case() and about 40% of toLocale{U,L}Case("<locale>").
+  if (IS_UNDEFINED(locales)) {
+    language = GetDefaultICULocaleJS();
+  } else if (IS_STRING(locales)) {
+    language = canonicalizeLanguageTag(locales);
+  } else {
+    var locales = initializeLocaleList(locales);
+    language = locales.length > 0 ? locales[0] : GetDefaultICULocaleJS();
+  }
+
+  // StringSplit is slwoer than this.

[Yang, 2016/04/29 07:38:47]

"slower"

[jungshik at Google, 2016/04/29 18:03:23]

Done.

+  var pos = %_Call(StringIndexOf, language, '-');
+  if (pos != -1) {
+    language = %_Call(StringSubstring, language, 0, pos);
+  }
+
+  var CUSTOM_CASE_LANGUAGES = ['az', 'el', 'lt', 'tr'];
+  var langIndex = %_Call(ArrayIndexOf, CUSTOM_CASE_LANGUAGES, language);
+  if (langIndex == -1) {
+    // language-independent case conversion.
+    return isToUpper ? %StringToUpperCaseI18N(s) : %StringToLowerCaseI18N(s);
+  }
+  return %StringLocaleConvertCase(s, isToUpper,
+                                  CUSTOM_CASE_LANGUAGES[langIndex]);
+}
+
 /**
  * Compares this and that, and returns less than 0, 0 or greater than 0 value.
  * Overrides the built-in method.
@@ -2042,6 +2078,47 @@ OverrideFunction(GlobalString.prototype, 'normalize', function() {
   }
 );
 
+/*
+OverrideFunction(GlobalString.prototype, 'toLowerCase', function() {
+    if (!IS_UNDEFINED(new.target)) {
+      throw MakeTypeError(kOrdinaryFunctionCalledAsConstructor);
+    }
+    CHECK_OBJECT_COERCIBLE(this, "String.prototype.toLowerCase");
+    var s = TO_STRING(this);
+    return %StringToLowerCaseI18N(s);
+  }
+);
+
+OverrideFunction(GlobalString.prototype, 'toUpperCase', function() {
+    if (!IS_UNDEFINED(new.target)) {
+      throw MakeTypeError(kOrdinaryFunctionCalledAsConstructor);
+    }
+    CHECK_OBJECT_COERCIBLE(this, "String.prototype.toLowerCase");
+    var s = TO_STRING(this);
+    return %StringToUpperCaseI18N(s);
+  }
+);
+*/
+
+OverrideFunction(GlobalString.prototype, 'toLocaleLowerCase', function() {
+    if (!IS_UNDEFINED(new.target)) {
+      throw MakeTypeError(kOrdinaryFunctionCalledAsConstructor);
+    }
+    CHECK_OBJECT_COERCIBLE(this, "String.prototype.toLocaleLowerCase");
+    return LocaleConvertCase(TO_STRING(this), arguments[0], false);
+  }
+);
+
+
+OverrideFunction(GlobalString.prototype, 'toLocaleUpperCase', function() {
+    if (!IS_UNDEFINED(new.target)) {
+      throw MakeTypeError(kOrdinaryFunctionCalledAsConstructor);
+    }
+    CHECK_OBJECT_COERCIBLE(this, "String.prototype.toLocaleUpperCase");
+    return LocaleConvertCase(TO_STRING(this), arguments[0], true);
+  }
+);
+
 
 /**
  * Formats a Number object (this) using locale and options values.