Title: [277790] trunk/Source/WebCore
- Revision
- 277790
- Author
- [email protected]
- Date
- 2021-05-20 09:45:53 -0700 (Thu, 20 May 2021)
Log Message
[Modern Media Controls] should not include `TextTrack` when sorting `TextTrackList` if it doesn't have a desired `TextTrack::Kind` when `CaptionDisplayMode::Manual`
https://bugs.webkit.org/show_bug.cgi?id=225992
Reviewed by Eric Carlson.
* page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::CaptionUserPreferencesMediaAF::sortedTrackListForMenu):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (277789 => 277790)
--- trunk/Source/WebCore/ChangeLog 2021-05-20 16:13:29 UTC (rev 277789)
+++ trunk/Source/WebCore/ChangeLog 2021-05-20 16:45:53 UTC (rev 277790)
@@ -1,3 +1,13 @@
+2021-05-20 Devin Rousso <[email protected]>
+
+ [Modern Media Controls] should not include `TextTrack` when sorting `TextTrackList` if it doesn't have a desired `TextTrack::Kind` when `CaptionDisplayMode::Manual`
+ https://bugs.webkit.org/show_bug.cgi?id=225992
+
+ Reviewed by Eric Carlson.
+
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::CaptionUserPreferencesMediaAF::sortedTrackListForMenu):
+
2021-05-20 Peng Liu <[email protected]>
AirPlay icon of the Vimeo.com video player is missing after reloading the page
Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (277789 => 277790)
--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2021-05-20 16:13:29 UTC (rev 277789)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2021-05-20 16:45:53 UTC (rev 277790)
@@ -746,6 +746,9 @@
for (unsigned i = 0, length = trackList->length(); i < length; ++i) {
TextTrack* track = trackList->item(i);
+ if (!kinds.contains(track->kind()))
+ continue;
+
String language = displayNameForLanguageLocale(track->validBCP47Language());
if (displayMode == Manual) {
@@ -754,9 +757,6 @@
continue;
}
- if (!kinds.contains(track->kind()))
- continue;
-
if (requestingCaptionsOrDescriptionsOrSubtitles) {
if (track->containsOnlyForcedSubtitles()) {
LOG(Media, "CaptionUserPreferencesMediaAF::sortedTrackListForMenu - skipping '%s' track with language '%s' because it contains only forced subtitles", track->kindKeyword().string().utf8().data(), language.utf8().data());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
