Changeset 148907 in webkit

Timestamp:

Apr 22, 2013 1:29:58 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] "automatic" track selection should only select a track that matches user language
​https://bugs.webkit.org/show_bug.cgi?id=114976

Reviewed by Jer Noble.

Source/WebCore:

Test: media/track/track-automatic-subtitles.html

• page/CaptionUserPreferencesMac.mm:

(WebCore::CaptionUserPreferencesMac::textTrackSelectionScore): When in "automatic" mode, only

consider text tracks that match the user's preferred language when the primary audio track
does not.

LayoutTests:

• media/track/track-automatic-subtitles-expected.txt: Added.
• media/track/track-automatic-subtitles.html: Added.
• platform/mac/TestExpectations: Skip track-user-preferences.html, the logic is no longer

correct for the Mac port.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/track/track-automatic-subtitles-expected.txt (added)
• LayoutTests/media/track/track-automatic-subtitles.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/CaptionUserPreferencesMac.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-22  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] "automatic" track selection should only select a track that matches user language
+        https://bugs.webkit.org/show_bug.cgi?id=114976
+
+        Reviewed by Jer Noble.
+
+        * media/track/track-automatic-subtitles-expected.txt: Added.
+        * media/track/track-automatic-subtitles.html: Added.
+        * platform/mac/TestExpectations: Skip track-user-preferences.html, the logic is no longer
+             correct for the Mac port.
+
 2013-04-22  Andy Estes  <aestes@apple.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1368 +1368 @@
 webkit.org/b/112492 media/track/track-prefer-captions.html [ Failure Pass ]
 
+# The logic in this test is no longer correct for Apple ports
+webkit.org/b/112492 media/track/track-user-preferences.html [ Skip ]
+
 webkit.org/b/104104 fast/overflow/scrollbar-click-retains-focus.html [ Failure ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-22  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] "automatic" track selection should only select a track that matches user language
+        https://bugs.webkit.org/show_bug.cgi?id=114976
+
+        Reviewed by Jer Noble.
+
+        Test: media/track/track-automatic-subtitles.html
+
+        * page/CaptionUserPreferencesMac.mm:
+        (WebCore::CaptionUserPreferencesMac::textTrackSelectionScore): When in "automatic" mode, only
+            consider text tracks that match the user's preferred language when the primary audio track
+            does not.
+
 2013-04-22  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm

@@ -636 +636 @@
             return 0;
 
-        String audioTrackLanguage;
+        String textTrackLanguage = track->language();
+        if (textTrackLanguage.isEmpty())
+            return 0;
 
         Vector<String> languageList;
         languageList.reserveCapacity(1);
 
+        String audioTrackLanguage;
         if (testingMode())
             audioTrackLanguage = primaryAudioTrackLanguageOverride();
@@ -650 +653 @@
 
         if (displayMode == Automatic) {
-            // Only enable a text track if the current audio track is not in the user's preferred language.
             languageList.append(defaultLanguage());
+
+            // Only enable a text track if the current audio track is NOT in the user's preferred language ...
             size_t offset = indexOfBestMatchingLanguageInList(audioTrackLanguage, languageList);
+            if (!offset)
+                return 0;
+
+            // and the text track matches the user's preferred language.
+            offset = indexOfBestMatchingLanguageInList(textTrackLanguage, languageList);
             if (offset)
                 return 0;
         } else {
-            // Only consider a forced-only track if it is in the same language as the primary audio track.
-            String trackLanguage = track->language();
-            if (trackLanguage.isEmpty())
-                return 0;
-
             languageList.append(audioTrackLanguage);
-            size_t offset = indexOfBestMatchingLanguageInList(trackLanguage, languageList);
+            size_t offset = indexOfBestMatchingLanguageInList(textTrackLanguage, languageList);
+
+            // Only consider a forced-only track if it IS in the same language as the primary audio track.
             if (offset)
                 return 0;