Changeset 152422 in webkit
- Timestamp:
- Jul 5, 2013 1:35:11 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r152419 r152422 1 2013-07-05 Eric Carlson <eric.carlson@apple.com> 2 3 [Mac] .webkitClosedCaptionsVisible doesn't work with "Automatic" caption mode 4 https://bugs.webkit.org/show_bug.cgi?id=118319 5 6 Reviewed by Jer Noble. 7 8 * media/track/track-legacyapi-with-automatic-mode-expected.txt: Added. 9 * media/track/track-legacyapi-with-automatic-mode.html: Added. 10 1 11 2013-07-05 Mario Sanchez Prada <mario.prada@samsung.com> 2 12 -
trunk/Source/WebCore/ChangeLog
r152416 r152422 1 2013-07-05 Eric Carlson <eric.carlson@apple.com> 2 3 [Mac] .webkitClosedCaptionsVisible doesn't work with "Automatic" caption mode 4 https://bugs.webkit.org/show_bug.cgi?id=118319 5 6 Reviewed by Jer Noble. 7 8 Track when captions are enabled with the old 'webkitClosedCaptionsVisible' attribute and 9 consider that when determining which track should be enabled. 10 11 Test: media/track/track-legacyapi-with-automatic-mode.html 12 13 * html/HTMLMediaElement.cpp: 14 (WebCore::HTMLMediaElement::HTMLMediaElement): Initialize m_webkitLegacyClosedCaptionOverride. 15 (WebCore::HTMLMediaElement::setWebkitClosedCaptionsVisible): Set m_webkitLegacyClosedCaptionOverride. 16 (WebCore::HTMLMediaElement::webkitClosedCaptionsVisible): Return m_webkitLegacyClosedCaptionOverride. 17 * html/HTMLMediaElement.h: 18 19 * page/CaptionUserPreferencesMediaAF.cpp: 20 (WebCore::CaptionUserPreferencesMediaAF::textTrackSelectionScore): Don't apply "automatic" 21 logic when captions were enabled with .webkitClosedCaptionsVisible. 22 1 23 2013-07-05 Benjamin Dupont <bdupont@nds.com> 2 24 -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r151947 r152422 299 299 , m_isFullscreen(false) 300 300 , m_closedCaptionsVisible(false) 301 , m_webkitLegacyClosedCaptionOverride(false) 301 302 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) 302 303 , m_needWidgetUpdate(false) … … 4527 4528 void HTMLMediaElement::setWebkitClosedCaptionsVisible(bool visible) 4528 4529 { 4530 m_webkitLegacyClosedCaptionOverride = visible; 4529 4531 setClosedCaptionsVisible(visible); 4530 4532 } … … 4532 4534 bool HTMLMediaElement::webkitClosedCaptionsVisible() const 4533 4535 { 4534 return m_ closedCaptionsVisible;4536 return m_webkitLegacyClosedCaptionOverride && m_closedCaptionsVisible; 4535 4537 } 4536 4538 -
trunk/Source/WebCore/html/HTMLMediaElement.h
r152150 r152422 711 711 bool m_isFullscreen : 1; 712 712 bool m_closedCaptionsVisible : 1; 713 bool m_webkitLegacyClosedCaptionOverride : 1; 713 714 714 715 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) -
trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp
r152333 r152422 681 681 Vector<String> userPreferredCaptionLanguages = preferredLanguages(); 682 682 683 if ( displayMode == Automatic|| trackHasOnlyForcedSubtitles) {683 if ((displayMode == Automatic && !legacyOverride) || trackHasOnlyForcedSubtitles) { 684 684 685 685 if (!mediaElement || !mediaElement->player())
Note: See TracChangeset
for help on using the changeset viewer.