Title: [277135] trunk
Revision
277135
Author
cdu...@apple.com
Date
2021-05-06 16:01:17 -0700 (Thu, 06 May 2021)

Log Message

Regression(r254389?) navigator.languages returns all lowercase languages for ports using CF
https://bugs.webkit.org/show_bug.cgi?id=225461

Reviewed by Darin Adler.

Source/WTF:

Stop lowercasing the languages returned by navigator.language / navigator.languages
as this does not match the specification [1][2] or other Web browsers. The proper format is
'en-US', not 'en-us'.

[1] https://html.spec.whatwg.org/#dom-navigator-language
[2] https://tools.ietf.org/html/bcp47

* wtf/cf/LanguageCF.cpp:
(WTF::httpStyleLanguageCode):

Tools:

Update existing API tests to reflect behavior change.

* TestWebKitAPI/Tests/WebKit/OverrideAppleLanguagesPreference.mm:
(TEST):
(TEST_F):

LayoutTests:

Update existing tests to reflect behavior change.

* fast/text/international/system-language/navigator-language/navigator-language-en-GB-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-en-GB.html:
* fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-en-US.html:
* fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-en.html:
* fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-es-ES.html:
* fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-es-MX.html:
* fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-es.html:
* fast/text/international/system-language/navigator-language/navigator-language-fr-CA-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-fr-CA.html:
* fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-fr.html:
* fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-hi.html:
* fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-pt-BR.html:
* fast/text/international/system-language/navigator-language/navigator-language-pt-PT-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-pt-PT.html:
* fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-ru.html:
* fast/text/international/system-language/navigator-language/navigator-language-zh-HK-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-zh-HK.html:
* fast/text/international/system-language/navigator-language/navigator-language-zh-Hans-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-zh-Hans.html:
* fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK.html:
* fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-zh-Hant.html:
* fast/text/international/system-language/navigator-language/navigator-language-zh-TW-expected.txt:
* fast/text/international/system-language/navigator-language/navigator-language-zh-TW.html:
* js/dom/navigator-language.html:
* platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt:
* platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt:
* platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt:
* platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt:
* platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt:
* platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt:
* platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt:
* platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt:
* platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-419-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-ja-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-zh-HK-expected.txt:
* platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (277134 => 277135)


--- trunk/LayoutTests/ChangeLog	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/ChangeLog	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,3 +1,70 @@
+2021-05-06  Chris Dumez  <cdu...@apple.com>
+
+        Regression(r254389?) navigator.languages returns all lowercase languages for ports using CF
+        https://bugs.webkit.org/show_bug.cgi?id=225461
+
+        Reviewed by Darin Adler.
+
+        Update existing tests to reflect behavior change.
+
+        * fast/text/international/system-language/navigator-language/navigator-language-en-GB-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-en-GB.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-en-US.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-en.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-es-ES.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-es-MX.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-es.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-fr-CA-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-fr-CA.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-fr.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-hi.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-pt-BR.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-pt-PT-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-pt-PT.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-ru.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-zh-HK-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-zh-HK.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-zh-Hans-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-zh-Hans.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-zh-Hant.html:
+        * fast/text/international/system-language/navigator-language/navigator-language-zh-TW-expected.txt:
+        * fast/text/international/system-language/navigator-language/navigator-language-zh-TW.html:
+        * js/dom/navigator-language.html:
+        * platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt:
+        * platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt:
+        * platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt:
+        * platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt:
+        * platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt:
+        * platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt:
+        * platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt:
+        * platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt:
+        * platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-419-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-ja-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-zh-HK-expected.txt:
+        * platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK-expected.txt:
+
 2021-05-06  Lauro Moura  <lmo...@igalia.com>
 
         [WPE] Garden accessibility failure and merge other expectations with glib one

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-GB-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-GB-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-GB-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "en-gb"
+PASS navigator.language is "en-GB"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-GB.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-GB.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-GB.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "en-gb");
+shouldBeEqualToString("navigator.language", "en-GB");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "en-us"
+PASS navigator.language is "en-US"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-US.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-US.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-US.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "en-us");
+shouldBeEqualToString("navigator.language", "en-US");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "en-us"
+PASS navigator.language is "en-US"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-en.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "en-us");
+shouldBeEqualToString("navigator.language", "en-US");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "es-es"
+PASS navigator.language is "es-ES"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-ES.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-ES.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-ES.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "es-es");
+shouldBeEqualToString("navigator.language", "es-ES");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "es-mx"
+PASS navigator.language is "es-MX"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-MX.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-MX.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-MX.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "es-mx");
+shouldBeEqualToString("navigator.language", "es-MX");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "es-es"
+PASS navigator.language is "es-ES"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-es.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "es-es");
+shouldBeEqualToString("navigator.language", "es-ES");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr-CA-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr-CA-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr-CA-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "fr-ca"
+PASS navigator.language is "fr-CA"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr-CA.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr-CA.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr-CA.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "fr-ca");
+shouldBeEqualToString("navigator.language", "fr-CA");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "fr-fr"
+PASS navigator.language is "fr-FR"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-fr.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "fr-fr");
+shouldBeEqualToString("navigator.language", "fr-FR");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "hi-in"
+PASS navigator.language is "hi-IN"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-hi.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-hi.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-hi.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "hi-in");
+shouldBeEqualToString("navigator.language", "hi-IN");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "pt-br"
+PASS navigator.language is "pt-BR"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-BR.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-BR.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-BR.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "pt-br");
+shouldBeEqualToString("navigator.language", "pt-BR");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-PT-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-PT-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-PT-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "pt-pt"
+PASS navigator.language is "pt-PT"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-PT.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-PT.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-pt-PT.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "pt-pt");
+shouldBeEqualToString("navigator.language", "pt-PT");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "ru-ru"
+PASS navigator.language is "ru-RU"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-ru.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-ru.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-ru.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "ru-ru");
+shouldBeEqualToString("navigator.language", "ru-RU");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-HK-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-HK-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-HK-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "zh-hk"
+PASS navigator.language is "zh-HK"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-HK.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-HK.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-HK.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "zh-hk");
+shouldBeEqualToString("navigator.language", "zh-HK");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hans-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hans-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hans-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "zh-cn"
+PASS navigator.language is "zh-CN"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hans.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hans.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hans.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "zh-cn");
+shouldBeEqualToString("navigator.language", "zh-CN");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "zh-hk"
+PASS navigator.language is "zh-HK"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "zh-hk");
+shouldBeEqualToString("navigator.language", "zh-HK");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "zh-tw"
+PASS navigator.language is "zh-TW"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "zh-tw");
+shouldBeEqualToString("navigator.language", "zh-TW");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-TW-expected.txt (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-TW-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-TW-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "zh-tw"
+PASS navigator.language is "zh-TW"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-TW.html (277134 => 277135)


--- trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-TW.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/fast/text/international/system-language/navigator-language/navigator-language-zh-TW.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -5,7 +5,7 @@
 </head>
 <body>
 <script>
-shouldBeEqualToString("navigator.language", "zh-tw");
+shouldBeEqualToString("navigator.language", "zh-TW");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/js/dom/navigator-language.html (277134 => 277135)


--- trunk/LayoutTests/js/dom/navigator-language.html	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/js/dom/navigator-language.html	2021-05-06 23:01:17 UTC (rev 277135)
@@ -15,7 +15,7 @@
 }
 
 var language = navigator.language;
-if (language == "en" || language == "en-us" || language == "en-US")
+if (language == "en" || language == "en-US")
     testPassed("");
 else
     testFailed("");

Modified: trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be en-us. Was en.
+FAIL navigator.language should be en-US. Was en.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be en-us. Was en.
+FAIL navigator.language should be en-US. Was en.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be es-es. Was es.
+FAIL navigator.language should be es-ES. Was es.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be es-mx. Was es-419.
+FAIL navigator.language should be es-MX. Was es-419.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be es-es. Was es.
+FAIL navigator.language should be es-ES. Was es.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be fr-fr. Was fr.
+FAIL navigator.language should be fr-FR. Was fr.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be hi-in. Was hi.
+FAIL navigator.language should be hi-IN. Was hi.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be pt-br. Was pt.
+FAIL navigator.language should be pt-BR. Was pt.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-catalina/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be ru-ru. Was ru.
+FAIL navigator.language should be ru-RU. Was ru.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-en-US-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "en-us"
+PASS navigator.language is "en-US"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-en-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "en-us"
+PASS navigator.language is "en-US"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-419-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-419-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-419-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be es-419. Was es-xl.
+FAIL navigator.language should be es-419. Was es-XL.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-ES-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "es-es"
+PASS navigator.language is "es-ES"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-MX-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be es-mx. Was es-xl.
+FAIL navigator.language should be es-MX. Was es-XL.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-es-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "es-es"
+PASS navigator.language is "es-ES"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-fr-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "fr-fr"
+PASS navigator.language is "fr-FR"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-hi-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "hi-in"
+PASS navigator.language is "hi-IN"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-ja-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-ja-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-ja-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be ja. Was ja-jp.
+FAIL navigator.language should be ja. Was ja-JP.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-pt-BR-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "pt-br"
+PASS navigator.language is "pt-BR"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-ru-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-PASS navigator.language is "ru-ru"
+PASS navigator.language is "ru-RU"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-zh-HK-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-zh-HK-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-zh-HK-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be zh-hk. Was zh-tw.
+FAIL navigator.language should be zh-HK. Was zh-TW.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK-expected.txt (277134 => 277135)


--- trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK-expected.txt	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/LayoutTests/platform/mac-mojave/fast/text/international/system-language/navigator-language/navigator-language-zh-Hant-HK-expected.txt	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,4 +1,4 @@
-FAIL navigator.language should be zh-hk. Was zh-tw.
+FAIL navigator.language should be zh-HK. Was zh-TW.
 PASS successfullyParsed is true
 Some tests failed.
 

Modified: trunk/Source/WTF/ChangeLog (277134 => 277135)


--- trunk/Source/WTF/ChangeLog	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/Source/WTF/ChangeLog	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,3 +1,20 @@
+2021-05-06  Chris Dumez  <cdu...@apple.com>
+
+        Regression(r254389?) navigator.languages returns all lowercase languages for ports using CF
+        https://bugs.webkit.org/show_bug.cgi?id=225461
+
+        Reviewed by Darin Adler.
+
+        Stop lowercasing the languages returned by navigator.language / navigator.languages
+        as this does not match the specification [1][2] or other Web browsers. The proper format is
+        'en-US', not 'en-us'.
+
+        [1] https://html.spec.whatwg.org/#dom-navigator-language
+        [2] https://tools.ietf.org/html/bcp47
+
+        * wtf/cf/LanguageCF.cpp:
+        (WTF::httpStyleLanguageCode):
+
 2021-05-06  Filip Pizlo  <fpi...@apple.com>
 
         Remove old and unused memory barrier abstractions

Modified: trunk/Source/WTF/wtf/cf/LanguageCF.cpp (277134 => 277135)


--- trunk/Source/WTF/wtf/cf/LanguageCF.cpp	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/Source/WTF/wtf/cf/LanguageCF.cpp	2021-05-06 23:01:17 UTC (rev 277135)
@@ -85,9 +85,7 @@
     if (CFStringGetLength(mutableLanguageCode.get()) >= 3 && CFStringGetCharacterAtIndex(mutableLanguageCode.get(), 2) == '_')
         CFStringReplace(mutableLanguageCode.get(), CFRangeMake(2, 1), CFSTR("-"));
 
-    CFStringLowercase(mutableLanguageCode.get(), nullptr);
     return mutableLanguageCode.get();
-
 }
 
 void platformLanguageDidChange()

Modified: trunk/Tools/ChangeLog (277134 => 277135)


--- trunk/Tools/ChangeLog	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/Tools/ChangeLog	2021-05-06 23:01:17 UTC (rev 277135)
@@ -1,3 +1,16 @@
+2021-05-06  Chris Dumez  <cdu...@apple.com>
+
+        Regression(r254389?) navigator.languages returns all lowercase languages for ports using CF
+        https://bugs.webkit.org/show_bug.cgi?id=225461
+
+        Reviewed by Darin Adler.
+
+        Update existing API tests to reflect behavior change.
+
+        * TestWebKitAPI/Tests/WebKit/OverrideAppleLanguagesPreference.mm:
+        (TEST):
+        (TEST_F):
+
 2021-05-06  Devin Rousso  <drou...@apple.com>
 
         Sampled Page Top Color: make hit tests consider elements with `pointer-events: none`

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/OverrideAppleLanguagesPreference.mm (277134 => 277135)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit/OverrideAppleLanguagesPreference.mm	2021-05-06 22:31:46 UTC (rev 277134)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/OverrideAppleLanguagesPreference.mm	2021-05-06 23:01:17 UTC (rev 277135)
@@ -49,7 +49,7 @@
         return [webView stringByEvaluatingJavaScript:@"window.internals.userPreferredLanguages()[0]"];
     };
 
-    ASSERT_TRUE([preferredLanguage() isEqual:@"en-gb"]);
+    ASSERT_TRUE([preferredLanguage() isEqual:@"en-GB"]);
 }
 
 #endif // WK_HAVE_C_SPI
@@ -101,7 +101,7 @@
     auto preferredLanguage = [&] {
         return [webView stringByEvaluatingJavaScript:@"navigator.language"];
     };
-    EXPECT_WK_STREQ(@"en-gb", preferredLanguage());
+    EXPECT_WK_STREQ(@"en-GB", preferredLanguage());
 
     __block bool done = false;
     [webView evaluateJavaScript:@"_onlanguagechange_ = () => { webkit.messageHandlers.testHandler.postMessage(navigator.language); }; true;" completionHandler:^(id value, NSError *error) {
@@ -113,7 +113,7 @@
     done = false;
     __block bool didChangeLanguage = false;
     [webView performAfterReceivingAnyMessage:^(NSString *newLanguage) {
-        EXPECT_WK_STREQ(@"en-us", newLanguage);
+        EXPECT_WK_STREQ(@"en-US", newLanguage);
         didChangeLanguage = true;
         done = true;
     }];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to