Changeset 149502 in webkit

Timestamp:

May 2, 2013 3:57:35 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] caption track menu includes "easy to read" in-band tracks twice
​https://bugs.webkit.org/show_bug.cgi?id=115529

Reviewed by Dean Jackson.

• page/CaptionUserPreferencesMac.mm:

(WebCore::CaptionUserPreferencesMac::sortedTrackListForMenu): Check to see if a track is

easy-to-read after checking if it is forced only.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/CaptionUserPreferencesMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-02  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] caption track menu includes "easy to read" in-band tracks twice
+        https://bugs.webkit.org/show_bug.cgi?id=115529
+
+        Reviewed by Dean Jackson.
+
+        * page/CaptionUserPreferencesMac.mm:
+        (WebCore::CaptionUserPreferencesMac::sortedTrackListForMenu): Check to see if a track is
+             easy-to-read after checking if it is forced only.
+
 2013-05-02  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm

@@ -749 +749 @@
         String language = displayNameForLanguageLocale(track->language());
 
+        if (track->containsOnlyForcedSubtitles())
+            continue;
+        
         if (track->isEasyToRead()) {
             if (!language.isEmpty())
@@ -755 +758 @@
             continue;
         }
-
-        if (track->containsOnlyForcedSubtitles())
-            continue;
 
         if (!language.isEmpty() && track->isMainProgramContent()) {