Title: [260206] branches/safari-609-branch/LayoutTests
Revision
260206
Author
ryanhad...@apple.com
Date
2020-04-16 11:38:22 -0700 (Thu, 16 Apr 2020)

Log Message

Cherry-pick r259621. rdar://problem/59461792

    [Cocoa] REGRESSION(r254389): fast/text/international/system-language/declarative-language.html is failing
    https://bugs.webkit.org/show_bug.cgi?id=208023
    <rdar://problem/59461792>

    Reviewed by Simon Fraser.

    minimizedLanguagesFromLanguages() is supposed to minimize the language list;
    that's its whole raison d'être

    * fast/text/international/system-language/declarative-language-expected.txt:
    * fast/text/international/system-language/declarative-language.html:
    * platform/mac/TestExpectations:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259621 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-609-branch/LayoutTests/ChangeLog (260205 => 260206)


--- branches/safari-609-branch/LayoutTests/ChangeLog	2020-04-16 18:38:20 UTC (rev 260205)
+++ branches/safari-609-branch/LayoutTests/ChangeLog	2020-04-16 18:38:22 UTC (rev 260206)
@@ -1,3 +1,37 @@
+2020-04-16  Ryan Haddad  <ryanhad...@apple.com>
+
+        Cherry-pick r259621. rdar://problem/59461792
+
+    [Cocoa] REGRESSION(r254389): fast/text/international/system-language/declarative-language.html is failing
+    https://bugs.webkit.org/show_bug.cgi?id=208023
+    <rdar://problem/59461792>
+    
+    Reviewed by Simon Fraser.
+    
+    minimizedLanguagesFromLanguages() is supposed to minimize the language list;
+    that's its whole raison d'être
+    
+    * fast/text/international/system-language/declarative-language-expected.txt:
+    * fast/text/international/system-language/declarative-language.html:
+    * platform/mac/TestExpectations:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259621 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-04-06  Myles C. Maxfield  <mmaxfi...@apple.com>
+
+            [Cocoa] REGRESSION(r254389): fast/text/international/system-language/declarative-language.html is failing
+            https://bugs.webkit.org/show_bug.cgi?id=208023
+            <rdar://problem/59461792>
+
+            Reviewed by Simon Fraser.
+
+            minimizedLanguagesFromLanguages() is supposed to minimize the language list;
+            that's its whole raison d'être
+
+            * fast/text/international/system-language/declarative-language-expected.txt:
+            * fast/text/international/system-language/declarative-language.html:
+            * platform/mac/TestExpectations:
+
 2020-04-10  Ryan Haddad  <ryanhad...@apple.com>
 
         Cherry-pick r257821. rdar://problem/61408640

Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/declarative-language-expected.txt (260205 => 260206)


--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/declarative-language-expected.txt	2020-04-16 18:38:20 UTC (rev 260205)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/declarative-language-expected.txt	2020-04-16 18:38:22 UTC (rev 260206)
@@ -1,6 +1,5 @@
-PASS internals.userPreferredLanguages().length is 2
+PASS internals.userPreferredLanguages().length is 1
 PASS internals.userPreferredLanguages()[0].startsWith('ko') is true
-PASS internals.userPreferredLanguages()[1].startsWith('zh') is true
 PASS internals.userPreferredLanguages().length is 3
 PASS internals.userPreferredLanguages()[0] is "hi"
 PASS internals.userPreferredLanguages()[1] is "jp"

Modified: branches/safari-609-branch/LayoutTests/fast/text/international/system-language/declarative-language.html (260205 => 260206)


--- branches/safari-609-branch/LayoutTests/fast/text/international/system-language/declarative-language.html	2020-04-16 18:38:20 UTC (rev 260205)
+++ branches/safari-609-branch/LayoutTests/fast/text/international/system-language/declarative-language.html	2020-04-16 18:38:22 UTC (rev 260206)
@@ -6,9 +6,10 @@
 <body>
 <script>
 if (window.internals) {
-    shouldBe("internals.userPreferredLanguages().length", "2");
+    // minimizedLanguagesFromLanguages() simplifies the language list.
+    // This is intentional.
+    shouldBe("internals.userPreferredLanguages().length", "1");
     shouldBeTrue("internals.userPreferredLanguages()[0].startsWith('ko')");
-    shouldBeTrue("internals.userPreferredLanguages()[1].startsWith('zh')");
     internals.setUserPreferredLanguages(["hi", "jp", "in"]);
     shouldBe("internals.userPreferredLanguages().length", "3");
     shouldBeEqualToString("internals.userPreferredLanguages()[0]", "hi");

Modified: branches/safari-609-branch/LayoutTests/platform/mac/TestExpectations (260205 => 260206)


--- branches/safari-609-branch/LayoutTests/platform/mac/TestExpectations	2020-04-16 18:38:20 UTC (rev 260205)
+++ branches/safari-609-branch/LayoutTests/platform/mac/TestExpectations	2020-04-16 18:38:22 UTC (rev 260206)
@@ -1967,7 +1967,6 @@
 
 webkit.org/b/205757 webgl/1.0.3/conformance/textures/texture-upload-size.html [ Pass Timeout ]
 
-# The navigator.language tests rely on functionality only available in recent releases of macOS Catalina and onward.
-webkit.org/b/200043 [ Sierra HighSierra Mojave Catalina ] fast/text/international/system-language/navigator-language [ Pass Failure ]
+webkit.org/b/200043 [ Sierra HighSierra Mojave ] fast/text/international/system-language/navigator-language [ Failure ]
 
-webkit.org/b/206965 storage/indexeddb/intversion-long-queue-private.html [ Pass Failure ]
+webkit.org/b/206965 storage/indexeddb/intversion-long-queue-private.html [ Pass Failure ]
\ No newline at end of file
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to