Changeset 204601 in webkit
- Timestamp:
- Aug 18, 2016 11:05:56 AM (8 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r204596 r204601 1 2016-08-18 Eric Carlson <eric.carlson@apple.com> 2 3 AX: Audio Description tracks are not labeled correctly, causing user confusion 4 https://bugs.webkit.org/show_bug.cgi?id=160652 5 <rdar://problem/27742208> 6 7 Reviewed by Antoine Quint. 8 9 * http/tests/media/hls/hls-accessiblity-describes-video-menu-expected.txt: Added. 10 * http/tests/media/hls/hls-accessiblity-describes-video-menu.html: Added. 11 12 * media/trackmenu-test.js: 13 (clickCCButton): Fail immediately if "video" is null or not a media element. Make failure 14 logging more descriptive. 15 16 * platform/gtk/TestExpectations: Skip new test. 17 18 * platform/ios-simulator/media/video-controls-captions-trackmenu-expected.txt: Updated for 19 clickCCButton error message change. 20 * platform/ios-simulator/media/video-controls-captions-trackmenu-hide-on-click-expected.txt: Ditto. 21 * platform/ios-simulator/media/video-controls-captions-trackmenu-localized-expected.txt: Ditto. 22 * platform/ios-simulator/media/video-controls-captions-trackmenu-sorted-expected.txt: Ditto. 23 1 24 2016-08-18 Ryan Haddad <ryanhaddad@apple.com> 2 25 -
trunk/LayoutTests/media/trackmenu-test.js
r180441 r204601 3 3 function clickCCButton() 4 4 { 5 if (!video || (video.nodeName != "VIDEO" && video.nodeName != "AUDIO")) { 6 consoleWrite(`<br>*** ERROR: 'video' global = "${video} in clickCCButton`); 7 endTest(); 8 } 9 5 10 if (!captionsButtonCoordinates) { 6 11 try { 7 12 captionsButtonCoordinates = mediaControlsButtonCoordinates(video, "toggle-closed-captions-button"); 8 13 } catch (exception) { 9 failTest( exception.description);14 failTest(`clickCCButton failed with exception: "${exception.description}:`); 10 15 return; 11 16 } -
trunk/LayoutTests/platform/gtk/TestExpectations
r204191 r204601 669 669 webkit.org/b/154390 [ Release ] http/tests/media/hls/hls-audio-tracks.html [ Timeout Failure ] 670 670 webkit.org/b/154390 [ Release ] http/tests/media/hls/hls-audio-tracks-has-audio.html [ Timeout Failure ] 671 webkit.org/b/154390 [ Release ] http/tests/media/hls/hls-accessiblity-describes-video.html [ Timeout Failure ]672 671 webkit.org/b/154390 [ Release ] http/tests/media/hls/video-cookie.html [ Failure ] 673 672 webkit.org/b/154390 http/tests/security/local-video-source-from-remote.html [ Timeout Pass ] … … 727 726 security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html [ Skip ] 728 727 security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html [ Skip ] 728 729 # No support for descriptive audio tracks in HLS file 730 http/tests/media/hls/hls-accessiblity-describes-video-menu.html [ Skip ] 731 http/tests/media/hls/hls-accessiblity-describes-video.html [ Skip ] 729 732 730 733 #//////////////////////////////////////////////////////////////////////////////////////// -
trunk/LayoutTests/platform/ios-simulator/media/video-controls-captions-trackmenu-expected.txt
r203927 r204601 6 6 *** Set the user language preference. 7 7 RUN(internals.setUserPreferredLanguages(['en'])) 8 undefinedFAIL8 clickCCButton failed with exception: "undefined: FAIL 9 9 END OF TEST 10 10 -
trunk/LayoutTests/platform/ios-simulator/media/video-controls-captions-trackmenu-hide-on-click-expected.txt
r203927 r204601 6 6 *** Set the user language preference. 7 7 RUN(internals.setUserPreferredLanguages(['en'])) 8 undefinedFAIL8 clickCCButton failed with exception: "undefined: FAIL 9 9 END OF TEST 10 10 -
trunk/LayoutTests/platform/ios-simulator/media/video-controls-captions-trackmenu-localized-expected.txt
r203927 r204601 6 6 *** Set the user language preference. 7 7 RUN(internals.setUserPreferredLanguages(['en'])) 8 undefinedFAIL8 clickCCButton failed with exception: "undefined: FAIL 9 9 END OF TEST 10 10 -
trunk/LayoutTests/platform/ios-simulator/media/video-controls-captions-trackmenu-sorted-expected.txt
r203927 r204601 6 6 *** Set the user language preference. 7 7 RUN(internals.setUserPreferredLanguages(['en'])) 8 undefinedFAIL8 clickCCButton failed with exception: "undefined: FAIL 9 9 END OF TEST 10 10 -
trunk/Source/WebCore/ChangeLog
r204599 r204601 1 2016-08-18 Eric Carlson <eric.carlson@apple.com> 2 3 AX: Audio Description tracks are not labeled correctly, causing user confusion 4 https://bugs.webkit.org/show_bug.cgi?id=160652 5 <rdar://problem/27742208> 6 7 Reviewed by Antoine Quint. 8 9 * http/tests/media/hls/hls-accessiblity-describes-video-menu-expected.txt: Added. 10 * http/tests/media/hls/hls-accessiblity-describes-video-menu.html: Added. 11 12 * media/trackmenu-test.js: 13 (clickCCButton): Fail immediately if "video" is null or not a media element. Make failure 14 logging more descriptive. 15 16 * platform/gtk/TestExpectations: Skip new test. 17 18 * platform/ios-simulator/media/video-controls-captions-trackmenu-expected.txt: Updated for 19 clickCCButton error message change. 20 * platform/ios-simulator/media/video-controls-captions-trackmenu-hide-on-click-expected.txt: Ditto. 21 * platform/ios-simulator/media/video-controls-captions-trackmenu-localized-expected.txt: Ditto. 22 * platform/ios-simulator/media/video-controls-captions-trackmenu-sorted-expected.txt: Ditto. 23 1 24 2016-08-18 Alex Christensen <achristensen@webkit.org> 2 25 -
trunk/Source/WebCore/English.lproj/Localizable.strings
r203801 r204601 35 35 "%@ CC" = "%@ CC"; 36 36 37 /* Text track contains Audio Descriptions */ 38 "%@ AD" = "%@ AD"; 39 37 40 /* visible name of the database process. The argument is the application name. */ 38 41 "%@ Database Storage" = "%@ Database Storage"; -
trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp
r201883 r204601 654 654 if (displayName.isEmpty()) 655 655 displayName.append(audioTrackNoLabelText()); 656 657 return displayName.toString(); 656 657 if (track->kind() != AudioTrack::descriptionKeyword()) 658 return displayName.toString(); 659 660 return audioDescriptionTrackSuffixText(displayName.toString()); 658 661 } 659 662 -
trunk/Source/WebCore/platform/LocalizedStrings.cpp
r203801 r204601 1146 1146 return formatLocalizedString(WEB_UI_STRING("%@ Forced", "Text track contains forced subtitles"), title.createCFString().get()); 1147 1147 } 1148 1149 String audioDescriptionTrackSuffixText(const String& title) 1150 { 1151 return formatLocalizedString(WEB_UI_STRING("%@ AD", "Text track contains Audio Descriptions"), title.createCFString().get()); 1152 } 1148 1153 #endif 1149 1154 -
trunk/Source/WebCore/platform/LocalizedStrings.h
r203801 r204601 267 267 String easyReaderTrackMenuItemText(const String&); 268 268 String forcedTrackMenuItemText(const String&); 269 String audioDescriptionTrackSuffixText(const String&); 269 270 #endif 270 271 #endif -
trunk/Source/WebCore/platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
r179364 r204601 115 115 if ([m_assetTrack hasMediaCharacteristic:AVMediaCharacteristicIsAuxiliaryContent]) 116 116 return AudioTrackPrivate::Alternative; 117 if ([m_assetTrack hasMediaCharacteristic:AVMediaCharacteristicDescribesVideoForAccessibility]) 118 return AudioTrackPrivate::Description; 117 119 if ([m_assetTrack hasMediaCharacteristic:AVMediaCharacteristicIsMainProgramContent]) 118 120 return AudioTrackPrivate::Main; … … 124 126 if ([option hasMediaCharacteristic:AVMediaCharacteristicIsAuxiliaryContent]) 125 127 return AudioTrackPrivate::Alternative; 128 if ([option hasMediaCharacteristic:AVMediaCharacteristicDescribesVideoForAccessibility]) 129 return AudioTrackPrivate::Description; 126 130 if ([option hasMediaCharacteristic:AVMediaCharacteristicIsMainProgramContent]) 127 131 return AudioTrackPrivate::Main;
Note: See TracChangeset
for help on using the changeset viewer.