<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[182298] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182298">182298</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-04-02 17:27:06 -0700 (Thu, 02 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: Caption Menus show language codes instead of display names.
https://bugs.webkit.org/show_bug.cgi?id=143350
<rdar://problem/20094145>
Reviewed by Jer Noble.
The generic caption/track label handling in CaptionUserPreferences does not convert language codes
(e.g. 'fr-CA') into display names (e.g., 'French (Canada)'). Because we did not have an AudioTrack
override to process these types of menu items, they were being handled using the generic code.
* page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::buildStringForTrackBase): Helper function to share code with the two flavors
of 'trackDisplayName'.
(WebCore::trackDisplayName): Add a version to support AudioTracks, and modify the TextTrack
version to use the new 'buildStringForTrackBase' function.
(WebCore::CaptionUserPreferencesMediaAF::displayNameForTrack): Add an AudioTrack override so
our AVFoundation tracks are processed in our CaptionUserPreferencesMediaAF implementation, not the
generic version.
(WebCore::CaptionUserPreferencesMediaAF::sortedTrackListForMenu): Add an AudioTrack override so
that the menu items are sorted in order of display name, not language code.
* page/CaptionUserPreferencesMediaAF.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp">trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesMediaAFh">trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182297 => 182298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-03 00:09:42 UTC (rev 182297)
+++ trunk/Source/WebCore/ChangeLog 2015-04-03 00:27:06 UTC (rev 182298)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-04-02 Brent Fulgham <bfulgham@apple.com>
+
+ REGRESSION: Caption Menus show language codes instead of display names.
+ https://bugs.webkit.org/show_bug.cgi?id=143350
+ <rdar://problem/20094145>
+
+ Reviewed by Jer Noble.
+
+ The generic caption/track label handling in CaptionUserPreferences does not convert language codes
+ (e.g. 'fr-CA') into display names (e.g., 'French (Canada)'). Because we did not have an AudioTrack
+ override to process these types of menu items, they were being handled using the generic code.
+
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::buildStringForTrackBase): Helper function to share code with the two flavors
+ of 'trackDisplayName'.
+ (WebCore::trackDisplayName): Add a version to support AudioTracks, and modify the TextTrack
+ version to use the new 'buildStringForTrackBase' function.
+ (WebCore::CaptionUserPreferencesMediaAF::displayNameForTrack): Add an AudioTrack override so
+ our AVFoundation tracks are processed in our CaptionUserPreferencesMediaAF implementation, not the
+ generic version.
+ (WebCore::CaptionUserPreferencesMediaAF::sortedTrackListForMenu): Add an AudioTrack override so
+ that the menu items are sorted in order of display name, not language code.
+ * page/CaptionUserPreferencesMediaAF.h:
+
</ins><span class="cx"> 2015-04-02 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Expose the "Share" menu for text selections on platforms where it's available.
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (182297 => 182298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2015-04-03 00:09:42 UTC (rev 182297)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2015-04-03 00:27:06 UTC (rev 182298)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CaptionUserPreferencesMediaAF.h"
</span><span class="cx">
</span><ins>+#include "AudioTrackList.h"
</ins><span class="cx"> #include "FloatConversion.h"
</span><span class="cx"> #include "HTMLMediaElement.h"
</span><span class="cx"> #include "URL.h"
</span><span class="lines">@@ -536,21 +537,16 @@
</span><span class="cx"> return lowercaseLanguageCode;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String trackDisplayName(TextTrack* track)
</del><ins>+static void buildDisplayStringForTrackBase(StringBuilder& displayName, const TrackBase& track)
</ins><span class="cx"> {
</span><del>- if (track == TextTrack::captionMenuOffItem())
- return textTrackOffMenuItemText();
- if (track == TextTrack::captionMenuAutomaticItem())
- return textTrackAutomaticMenuItemText();
</del><ins>+ String label = track.label();
+ String trackLanguageIdentifier = track.language();
</ins><span class="cx">
</span><del>- StringBuilder displayName;
- String label = track->label();
- String trackLanguageIdentifier = track->language();
-
</del><span class="cx"> RetainPtr<CFLocaleRef> currentLocale = adoptCF(CFLocaleCreate(kCFAllocatorDefault, defaultLanguage().createCFString().get()));
</span><span class="cx"> RetainPtr<CFStringRef> localeIdentifier = adoptCF(CFLocaleCreateCanonicalLocaleIdentifierFromString(kCFAllocatorDefault, trackLanguageIdentifier.createCFString().get()));
</span><span class="cx"> RetainPtr<CFStringRef> languageCF = adoptCF(CFLocaleCopyDisplayNameForPropertyValue(currentLocale.get(), kCFLocaleLanguageCode, localeIdentifier.get()));
</span><span class="cx"> String language = languageCF.get();
</span><ins>+
</ins><span class="cx"> if (!label.isEmpty()) {
</span><span class="cx"> if (language.isEmpty() || label.contains(language))
</span><span class="cx"> displayName.append(label);
</span><span class="lines">@@ -581,8 +577,35 @@
</span><span class="cx"> else
</span><span class="cx"> displayName.append(localeIdentifier.get());
</span><span class="cx"> }
</span><ins>+}
+
+static String trackDisplayName(AudioTrack* track)
+{
+ StringBuilder displayName;
+ buildDisplayStringForTrackBase(displayName, *track);
</ins><span class="cx">
</span><span class="cx"> if (displayName.isEmpty())
</span><ins>+ displayName.append(audioTrackNoLabelText());
+
+ return displayName.toString();
+}
+
+String CaptionUserPreferencesMediaAF::displayNameForTrack(AudioTrack* track) const
+{
+ return trackDisplayName(track);
+}
+
+static String trackDisplayName(TextTrack* track)
+{
+ if (track == TextTrack::captionMenuOffItem())
+ return textTrackOffMenuItemText();
+ if (track == TextTrack::captionMenuAutomaticItem())
+ return textTrackAutomaticMenuItemText();
+
+ StringBuilder displayName;
+ buildDisplayStringForTrackBase(displayName, *track);
+
+ if (displayName.isEmpty())
</ins><span class="cx"> displayName.append(textTrackNoLabelText());
</span><span class="cx">
</span><span class="cx"> if (track->isEasyToRead())
</span><span class="lines">@@ -722,6 +745,25 @@
</span><span class="cx"> return codePointCompare(trackDisplayName(a.get()), trackDisplayName(b.get())) < 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<RefPtr<AudioTrack>> CaptionUserPreferencesMediaAF::sortedTrackListForMenu(AudioTrackList* trackList)
+{
+ ASSERT(trackList);
+
+ Vector<RefPtr<AudioTrack>> tracksForMenu;
+
+ for (unsigned i = 0, length = trackList->length(); i < length; ++i) {
+ AudioTrack* track = trackList->item(i);
+ String language = displayNameForLanguageLocale(track->language());
+ tracksForMenu.append(track);
+ }
+
+ std::sort(tracksForMenu.begin(), tracksForMenu.end(), [](const RefPtr<AudioTrack>& a, const RefPtr<AudioTrack>& b) {
+ return codePointCompare(trackDisplayName(a.get()), trackDisplayName(b.get())) < 0;
+ });
+
+ return tracksForMenu;
+}
+
</ins><span class="cx"> Vector<RefPtr<TextTrack>> CaptionUserPreferencesMediaAF::sortedTrackListForMenu(TextTrackList* trackList)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(trackList);
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h (182297 => 182298)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h 2015-04-03 00:09:42 UTC (rev 182297)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h 2015-04-03 00:27:06 UTC (rev 182298)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -64,8 +64,10 @@
</span><span class="cx">
</span><span class="cx"> virtual String captionsStyleSheetOverride() const override;
</span><span class="cx"> virtual int textTrackSelectionScore(TextTrack*, HTMLMediaElement*) const override;
</span><del>- virtual Vector<RefPtr<TextTrack>> sortedTrackListForMenu(TextTrackList*) override;
- virtual String displayNameForTrack(TextTrack*) const override;
</del><ins>+ Vector<RefPtr<AudioTrack>> sortedTrackListForMenu(AudioTrackList*) override;
+ Vector<RefPtr<TextTrack>> sortedTrackListForMenu(TextTrackList*) override;
+ String displayNameForTrack(AudioTrack*) const override;
+ String displayNameForTrack(TextTrack*) const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> #if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
</span></span></pre>
</div>
</div>
</body>
</html>