Title: [149502] trunk/Source/WebCore
- Revision
- 149502
- Author
- [email protected]
- Date
- 2013-05-02 15:57:35 -0700 (Thu, 02 May 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149501 => 149502)
--- trunk/Source/WebCore/ChangeLog 2013-05-02 22:41:49 UTC (rev 149501)
+++ trunk/Source/WebCore/ChangeLog 2013-05-02 22:57:35 UTC (rev 149502)
@@ -1,3 +1,14 @@
+2013-05-02 Eric Carlson <[email protected]>
+
+ [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 <[email protected]>
Remove SiblingTraversalStrategies.h
Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm (149501 => 149502)
--- trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm 2013-05-02 22:41:49 UTC (rev 149501)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm 2013-05-02 22:57:35 UTC (rev 149502)
@@ -748,6 +748,9 @@
TextTrack* track = trackList->item(i);
String language = displayNameForLanguageLocale(track->language());
+ if (track->containsOnlyForcedSubtitles())
+ continue;
+
if (track->isEasyToRead()) {
if (!language.isEmpty())
languagesIncluded.add(language);
@@ -755,9 +758,6 @@
continue;
}
- if (track->containsOnlyForcedSubtitles())
- continue;
-
if (!language.isEmpty() && track->isMainProgramContent()) {
bool isAccessibilityTrack = track->kind() == track->captionsKeyword();
if (prefersAccessibilityTracks) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
