Diff
Modified: branches/safari-609-branch/LayoutTests/ChangeLog (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/ChangeLog 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/ChangeLog 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,5 +1,74 @@
2020-01-15 Alan Coon <alanc...@apple.com>
+ Cherry-pick r254412. rdar://problem/58548648
+
+ REGRESSION(r185816): In the Hong Kong locale, navigator.language reports it's in the Taiwan locale
+ https://bugs.webkit.org/show_bug.cgi?id=200043
+
+ Unreviewed.
+
+ Addressing additional review comments.
+
+ Source/WTF:
+
+ * wtf/cocoa/LanguageCocoa.mm:
+ (WTF::canMinimizeLanguages):
+
+ LayoutTests:
+
+ * fast/text/international/system-language/navigator-language/navigator-language-en-GB.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-en-US.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-en.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-es-419.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-es-ES.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-es-MX.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-es.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-fr-CA.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-fr.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-hi.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-ja.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-pt-BR.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-pt-PT.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-ru.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-HK.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-Hans.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-Hant.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-TW.html:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254412 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-11 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ REGRESSION(r185816): In the Hong Kong locale, navigator.language reports it's in the Taiwan locale
+ https://bugs.webkit.org/show_bug.cgi?id=200043
+
+ Unreviewed.
+
+ Addressing additional review comments.
+
+ * fast/text/international/system-language/navigator-language/navigator-language-en-GB.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-en-US.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-en.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-es-419.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-es-ES.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-es-MX.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-es.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-fr-CA.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-fr.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-hi.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-ja.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-pt-BR.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-pt-PT.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-ru.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-HK.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-Hans.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-Hant.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-TW.html:
+
+2020-01-15 Alan Coon <alanc...@apple.com>
+
Cherry-pick r254391. rdar://problem/58548648
REGRESSION(r185816): In the Hong Kong locale, navigator.language reports it's in the Taiwan locale
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-GB.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-GB.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-GB.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=en-GB ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "en-gb");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-US.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-US.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-US.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=en-US ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "en");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=en ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "en");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-419.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-419.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-419.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=es-419 ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "es-419");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-ES.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-ES.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-ES.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=es-ES ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "es");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-MX.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-MX.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-MX.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=es-MX ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "es-419");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=es ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "es");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr-CA.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr-CA.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr-CA.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=fr-CA ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "fr-ca");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=fr ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "fr");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-hi.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-hi.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-hi.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=hi ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "hi");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-ja.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-ja.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-ja.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=ja ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "ja");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-BR.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-BR.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-BR.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=pt-BR ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "pt");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-PT.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-PT.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-PT.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=pt-PT ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "pt-pt");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-ru.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-ru.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-ru.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=ru ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "ru");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-HK.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-HK.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-HK.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=zh-HK ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "zh-hk");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hans.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hans.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hans.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=zh-Hans ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "zh-cn");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=zh-Hant-HK ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "zh-hk");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=zh-Hant ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "zh-tw");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-TW.html (254618 => 254619)
--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-TW.html 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-TW.html 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,12 +1,11 @@
<!DOCTYPE html><!-- webkit-test-runner [ language=zh-TW ] -->
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
shouldBeEqualToString("navigator.language", "zh-tw");
</script>
-<script src=""
</body>
</html>
Modified: branches/safari-609-branch/Source/WTF/ChangeLog (254618 => 254619)
--- branches/safari-609-branch/Source/WTF/ChangeLog 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/Source/WTF/ChangeLog 2020-01-15 19:16:22 UTC (rev 254619)
@@ -1,5 +1,57 @@
2020-01-15 Alan Coon <alanc...@apple.com>
+ Cherry-pick r254412. rdar://problem/58548648
+
+ REGRESSION(r185816): In the Hong Kong locale, navigator.language reports it's in the Taiwan locale
+ https://bugs.webkit.org/show_bug.cgi?id=200043
+
+ Unreviewed.
+
+ Addressing additional review comments.
+
+ Source/WTF:
+
+ * wtf/cocoa/LanguageCocoa.mm:
+ (WTF::canMinimizeLanguages):
+
+ LayoutTests:
+
+ * fast/text/international/system-language/navigator-language/navigator-language-en-GB.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-en-US.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-en.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-es-419.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-es-ES.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-es-MX.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-es.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-fr-CA.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-fr.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-hi.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-ja.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-pt-BR.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-pt-PT.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-ru.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-HK.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-Hans.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-Hant.html:
+ * fast/text/international/system-language/navigator-language/navigator-language-zh-TW.html:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254412 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-11 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ REGRESSION(r185816): In the Hong Kong locale, navigator.language reports it's in the Taiwan locale
+ https://bugs.webkit.org/show_bug.cgi?id=200043
+
+ Unreviewed.
+
+ Addressing additional review comments.
+
+ * wtf/cocoa/LanguageCocoa.mm:
+ (WTF::canMinimizeLanguages):
+
+2020-01-15 Alan Coon <alanc...@apple.com>
+
Cherry-pick r254411. rdar://problem/58548648
Fix internal Apple builds after r254389
Modified: branches/safari-609-branch/Source/WTF/wtf/cocoa/LanguageCocoa.mm (254618 => 254619)
--- branches/safari-609-branch/Source/WTF/wtf/cocoa/LanguageCocoa.mm 2020-01-15 19:16:16 UTC (rev 254618)
+++ branches/safari-609-branch/Source/WTF/wtf/cocoa/LanguageCocoa.mm 2020-01-15 19:16:22 UTC (rev 254619)
@@ -33,7 +33,7 @@
bool canMinimizeLanguages()
{
- static NeverDestroyed<bool> result = [NSLocale respondsToSelector:@selector(minimizedLanguagesFromLanguages:)];
+ static bool result = [NSLocale respondsToSelector:@selector(minimizedLanguagesFromLanguages:)];
return result.get();
}