Changeset 147000 in webkit
- Timestamp:
- Mar 27, 2013 11:33:16 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r146999 r147000 1 2013-03-27 Sergio Villar Senin <svillar@igalia.com> 2 3 Inserting a blank (" ") at the end of a line does not insert anything in Overtype mode 4 https://bugs.webkit.org/show_bug.cgi?id=113413 5 6 Reviewed by Ryosuke Niwa. 7 8 Updated the test to include the case of inserting a whitespace 9 both in the middle or at the end of a line. 10 11 * editing/execCommand/overtype-expected.txt: 12 * editing/execCommand/overtype.html: 1 2013-03-27 Eric Carlson <eric.carlson@apple.com> 2 3 [Mac] Text track menu items sometimes labeled incorrectly 4 https://bugs.webkit.org/show_bug.cgi?id=113406 5 6 Reviewed by Jer Noble. 7 8 * media/video-controls-captions-trackmenu-localized.html: 9 * platform/mac/media/video-controls-captions-trackmenu-localized-expected.txt: 13 10 14 11 2013-03-27 Zan Dobersek <zdobersek@igalia.com> -
trunk/LayoutTests/media/video-controls-captions-trackmenu-localized.html
r146380 r147000 45 45 46 46 item = captionsEntries[2]; 47 consoleWrite("<br>Third item in captions menu should be labelled ' Unknown SDH'");48 testExpected("item.textContent", " Unknown SDH");47 consoleWrite("<br>Third item in captions menu should be labelled 'Laugh Track (English-United States)'"); 48 testExpected("item.textContent", "Laugh Track (English-United States)"); 49 49 50 50 item = captionsEntries[3]; 51 consoleWrite("<br>Fourth item in captions menu should be labelled 'Unknown '");52 testExpected("item.textContent", "Unknown ");51 consoleWrite("<br>Fourth item in captions menu should be labelled 'Unknown SDH'"); 52 testExpected("item.textContent", "Unknown SDH"); 53 53 54 54 endTest(); … … 68 68 <video width="500" height="300" controls> 69 69 <track kind="captions" src="track/captions-webvtt/captions-fast.vtt"> 70 <track kind="subtitles" src="track/captions-webvtt/captions-fast.vtt" >70 <track kind="subtitles" src="track/captions-webvtt/captions-fast.vtt" label="Laugh Track" srclang="en-US"> 71 71 </video> 72 72 </body> -
trunk/LayoutTests/platform/mac/media/video-controls-captions-trackmenu-localized-expected.txt
r146380 r147000 12 12 13 13 Second item in captions menu should be labelled 'English CC' 14 EXPECTED (item.textContent == 'English CC'), OBSERVED ' Unknown SDH' FAIL14 EXPECTED (item.textContent == 'English CC'), OBSERVED 'Laugh Track (English-United States)' FAIL 15 15 16 Third item in captions menu should be labelled ' Unknown SDH'17 EXPECTED (item.textContent == ' Unknown SDH'), OBSERVED 'Unknown' FAIL16 Third item in captions menu should be labelled 'Laugh Track (English-United States)' 17 EXPECTED (item.textContent == 'Laugh Track (English-United States)'), OBSERVED 'Unknown SDH' FAIL 18 18 19 Fourth item in captions menu should be labelled 'Unknown '19 Fourth item in captions menu should be labelled 'Unknown SDH' 20 20 TypeError: 'undefined' is not an object (evaluating 'item.textContent') 21 21 END OF TEST -
trunk/Source/WebCore/ChangeLog
r146999 r147000 1 2013-03-27 Eric Carlson <eric.carlson@apple.com> 2 3 [Mac] Text track menu items sometimes labeled incorrectly 4 https://bugs.webkit.org/show_bug.cgi?id=113406 5 6 Reviewed by Jer Noble. 7 8 media/video-controls-captions-trackmenu-localized.html was updated to test this. 9 10 * page/CaptionUserPreferencesMac.mm: 11 (WebCore::trackDisplayName): Use the 'label' attribute for the menu text when necessary. 12 1 13 2013-03-27 Sergio Villar Senin <svillar@igalia.com> 2 14 -
trunk/Source/WebCore/page/CaptionUserPreferencesMac.mm
r146647 r147000 537 537 String language = languageCF.get(); 538 538 if (!label.isEmpty()) { 539 if (!language.isEmpty() && !label.contains(language)) { 539 if (language.isEmpty() || label.contains(language)) { 540 displayName.append(label); 541 } else { 540 542 RetainPtr<CFDictionaryRef> localeDict(AdoptCF, CFLocaleCreateComponentsFromLocaleIdentifier(kCFAllocatorDefault, localeIdentifier.get())); 541 543 if (localeDict) {
Note: See TracChangeset
for help on using the changeset viewer.