Title: [167578] trunk/Source/WebCore
- Revision
- 167578
- Author
- [email protected]
- Date
- 2014-04-20 21:28:20 -0700 (Sun, 20 Apr 2014)
Log Message
[Mac] Unable to select 'Off' or 'Auto' from track menu when tracks consist of unsupported track types
https://bugs.webkit.org/show_bug.cgi?id=131908
<rdar://problem/15999882>
Reviewed by Eric Carlson.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::setSelectedTextTrack): When the user selects 'Off', make sure the currently 'showing'
track is switched to 'disabled'.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (167577 => 167578)
--- trunk/Source/WebCore/ChangeLog 2014-04-21 04:19:07 UTC (rev 167577)
+++ trunk/Source/WebCore/ChangeLog 2014-04-21 04:28:20 UTC (rev 167578)
@@ -1,3 +1,15 @@
+2014-04-20 Brent Fulgham <[email protected]>
+
+ [Mac] Unable to select 'Off' or 'Auto' from track menu when tracks consist of unsupported track types
+ https://bugs.webkit.org/show_bug.cgi?id=131908
+ <rdar://problem/15999882>
+
+ Reviewed by Eric Carlson.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::setSelectedTextTrack): When the user selects 'Off', make sure the currently 'showing'
+ track is switched to 'disabled'.
+
2014-04-20 Andreas Kling <[email protected]>
Speed up jsStringWithCache() through WeakGCMap inlining.
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (167577 => 167578)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-21 04:19:07 UTC (rev 167577)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-21 04:28:20 UTC (rev 167578)
@@ -3714,6 +3714,9 @@
else
track->setMode(TextTrack::showingKeyword());
}
+ } else if (trackToSelect == TextTrack::captionMenuOffItem()) {
+ for (int i = 0, length = trackList->length(); i < length; ++i)
+ trackList->item(i)->setMode(TextTrack::disabledKeyword());
}
CaptionUserPreferences* captionPreferences = document().page() ? document().page()->group().captionPreferences() : 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
