Changeset 277793 in webkit

Timestamp:

May 20, 2021, 10:28:39 AM (4 years ago)

Author:

Devin Rousso

Message:

[Modern Media Controls] should not use codePointCompare as it doesn't take into account language specific sorting rules
​https://bugs.webkit.org/show_bug.cgi?id=225993

Reviewed by Eric Carlson.

• page/CaptionUserPreferences.cpp:

(WebCore::CaptionUserPreferences::sortedTrackListForMenu):

• page/CaptionUserPreferencesMediaAF.cpp:

(WebCore::textTrackCompare):
(WebCore::CaptionUserPreferencesMediaAF::sortedTrackListForMenu):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/CaptionUserPreferences.cpp (modified) (3 diffs)
• page/CaptionUserPreferencesMediaAF.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-20  Devin Rousso  <drousso@apple.com>
+
+        [Modern Media Controls] should not use `codePointCompare` as it doesn't take into account language specific sorting rules
+        https://bugs.webkit.org/show_bug.cgi?id=225993
+
+        Reviewed by Eric Carlson.
+
+        * page/CaptionUserPreferences.cpp:
+        (WebCore::CaptionUserPreferences::sortedTrackListForMenu):
+        * page/CaptionUserPreferencesMediaAF.cpp:
+        (WebCore::textTrackCompare):
+        (WebCore::CaptionUserPreferencesMediaAF::sortedTrackListForMenu):
+
 2021-05-20  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/page/CaptionUserPreferences.cpp

@@ -46 +46 @@
 #include <JavaScriptCore/StructureInlines.h>
 #include <wtf/Language.h>
+#include <wtf/unicode/Collator.h>
 
 namespace WebCore {
@@ -238 +239 @@
     }
 
-    std::sort(tracksForMenu.begin(), tracksForMenu.end(), [](auto& a, auto& b) {
-        return codePointCompare(trackDisplayName(a.get()), trackDisplayName(b.get())) < 0;
+    Collator collator;
+
+    std::sort(tracksForMenu.begin(), tracksForMenu.end(), [&] (auto& a, auto& b) {
+        return collator.collate(trackDisplayName(a.get()), trackDisplayName(b.get())) < 0;
     });
 
@@ -280 +283 @@
     }
 
-    std::sort(tracksForMenu.begin(), tracksForMenu.end(), [](auto& a, auto& b) {
-        return codePointCompare(trackDisplayName(a.get()), trackDisplayName(b.get())) < 0;
+    Collator collator;
+
+    std::sort(tracksForMenu.begin(), tracksForMenu.end(), [&] (auto& a, auto& b) {
+        return collator.collate(trackDisplayName(a.get()), trackDisplayName(b.get())) < 0;
     });
 

trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp

@@ -50 +50 @@
 #include <wtf/text/StringConcatenateNumbers.h>
 #include <wtf/text/cf/StringConcatenateCF.h>
+#include <wtf/unicode/Collator.h>
 
 #if PLATFORM(IOS_FAMILY)
@@ -682 +683 @@
 
     // Tracks in the user's preferred language are always at the top of the menu.
-    bool aIsPreferredLanguage = !codePointCompare(aLanguageDisplayName, preferredLanguageDisplayName);
-    bool bIsPreferredLanguage = !codePointCompare(bLanguageDisplayName, preferredLanguageDisplayName);
+    bool aIsPreferredLanguage = aLanguageDisplayName == preferredLanguageDisplayName;
+    bool bIsPreferredLanguage = bLanguageDisplayName == preferredLanguageDisplayName;
     if (aIsPreferredLanguage != bIsPreferredLanguage)
         return aIsPreferredLanguage;
 
+    Collator collator;
+
     // Tracks not in the user's preferred language sort first by language ...
-    if (auto languageDisplayNameComparison = codePointCompare(aLanguageDisplayName, bLanguageDisplayName))
+    if (auto languageDisplayNameComparison = collator.collate(aLanguageDisplayName, bLanguageDisplayName))
         return languageDisplayNameComparison < 0;
 
@@ -704 +707 @@
 
     // ... and tracks of the same type and language sort by the menu item text.
-    if (auto trackDisplayComparison = codePointCompare(trackDisplayName(a.get()), trackDisplayName(b.get())))
+    if (auto trackDisplayComparison = collator.collate(trackDisplayName(a.get()), trackDisplayName(b.get())))
         return trackDisplayComparison < 0;
 
@@ -722 +725 @@
         tracksForMenu.append(track);
     }
-    
-    std::sort(tracksForMenu.begin(), tracksForMenu.end(), [](auto& a, auto& b) {
-        auto trackDisplayComparison = codePointCompare(trackDisplayName(a.get()), trackDisplayName(b.get()));
-        if (trackDisplayComparison)
+
+    Collator collator;
+
+    std::sort(tracksForMenu.begin(), tracksForMenu.end(), [&] (auto& a, auto& b) {
+        if (auto trackDisplayComparison = collator.collate(trackDisplayName(a.get()), trackDisplayName(b.get())))
             return trackDisplayComparison < 0;