<!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>[168216] 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/168216">168216</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-02 18:13:40 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use displayNameForTrack instead of textTrack->label() for captions.
https://bugs.webkit.org/show_bug.cgi?id=131311
Patch by Jeremy Jones <jeremyj@apple.com> on 2014-05-02
Reviewed by Darin Adler.
Use the same mechanism as the desktop to build the captions list so it has the correct
names in the correct order including none and automatic.
* platform/ios/WebVideoFullscreenModelMediaElement.h:
* platform/ios/WebVideoFullscreenModelMediaElement.mm:
(WebVideoFullscreenModelMediaElement::setMediaElement):
move legible track code into updateLegibleOptions()
(WebVideoFullscreenModelMediaElement::handleEvent):
updateLegibleOptions on addTrack and removeTrack
(WebVideoFullscreenModelMediaElement::selectLegibleMediaOption):
select the corresponding TextTrack on HTMLMediaElement.
(WebVideoFullscreenModelMediaElement::updateLegibleOptions):
use the same mechanism as desktop to build the captions menu.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenModelMediaElementh">trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenModelMediaElementmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168215 => 168216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-03 01:12:27 UTC (rev 168215)
+++ trunk/Source/WebCore/ChangeLog 2014-05-03 01:13:40 UTC (rev 168216)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2014-05-02 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><ins>+ Use displayNameForTrack instead of textTrack->label() for captions.
+ https://bugs.webkit.org/show_bug.cgi?id=131311
+
+ Reviewed by Darin Adler.
+
+ Use the same mechanism as the desktop to build the captions list so it has the correct
+ names in the correct order including none and automatic.
+
+ * platform/ios/WebVideoFullscreenModelMediaElement.h:
+ * platform/ios/WebVideoFullscreenModelMediaElement.mm:
+ (WebVideoFullscreenModelMediaElement::setMediaElement):
+ move legible track code into updateLegibleOptions()
+
+ (WebVideoFullscreenModelMediaElement::handleEvent):
+ updateLegibleOptions on addTrack and removeTrack
+
+ (WebVideoFullscreenModelMediaElement::selectLegibleMediaOption):
+ select the corresponding TextTrack on HTMLMediaElement.
+
+ (WebVideoFullscreenModelMediaElement::updateLegibleOptions):
+ use the same mechanism as desktop to build the captions menu.
+
+2014-05-02 Jeremy Jones <jeremyj@apple.com>
+
</ins><span class="cx"> CSS-based Media Controls Show Different times content longer than 1 hour.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132443
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenModelMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.h (168215 => 168216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.h 2014-05-03 01:12:27 UTC (rev 168215)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.h 2014-05-03 01:13:40 UTC (rev 168216)
</span><span class="lines">@@ -35,18 +35,14 @@
</span><span class="cx"> #include <WebCore/WebVideoFullscreenModel.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><ins>+#include <wtf/Vector.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class HTMLMediaElement;
</span><ins>+class TextTrack;
</ins><span class="cx"> class WebVideoFullscreenInterface;
</span><span class="cx">
</span><span class="cx"> class WebVideoFullscreenModelMediaElement : public WebVideoFullscreenModel, public EventListener {
</span><del>- RefPtr<HTMLMediaElement> m_mediaElement;
- RetainPtr<PlatformLayer> m_videoFullscreenLayer;
- bool m_isListening;
- WebVideoFullscreenInterface* m_videoFullscreenInterface;
- FloatRect m_videoFrame;
-
</del><span class="cx"> public:
</span><span class="cx"> WebVideoFullscreenModelMediaElement();
</span><span class="cx"> virtual ~WebVideoFullscreenModelMediaElement();
</span><span class="lines">@@ -67,6 +63,16 @@
</span><span class="cx"> virtual void setVideoLayerGravity(WebVideoFullscreenModel::VideoGravity) override;
</span><span class="cx"> virtual void selectAudioMediaOption(uint64_t index) override;
</span><span class="cx"> virtual void selectLegibleMediaOption(uint64_t index) override;
</span><ins>+
+private:
+ RefPtr<HTMLMediaElement> m_mediaElement;
+ RetainPtr<PlatformLayer> m_videoFullscreenLayer;
+ bool m_isListening;
+ WebVideoFullscreenInterface* m_videoFullscreenInterface;
+ FloatRect m_videoFrame;
+ Vector<RefPtr<TextTrack>> m_legibleTracksForMenu;
+
+ void updateLegibleOptions();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenModelMediaElementmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm (168215 => 168216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm 2014-05-03 01:12:27 UTC (rev 168215)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm 2014-05-03 01:13:40 UTC (rev 168216)
</span><span class="lines">@@ -39,7 +39,10 @@
</span><span class="cx"> #import <WebCore/HTMLElement.h>
</span><span class="cx"> #import <WebCore/HTMLMediaElement.h>
</span><span class="cx"> #import <WebCore/HTMLVideoElement.h>
</span><ins>+#import <WebCore/Page.h>
+#import <WebCore/PageGroup.h>
</ins><span class="cx"> #import <WebCore/SoftLinking.h>
</span><ins>+#import <WebCore/TextTrackList.h>
</ins><span class="cx"> #import <WebCore/TimeRanges.h>
</span><span class="cx"> #import <WebCore/WebCoreThreadRun.h>
</span><span class="cx"> #import <QuartzCore/CoreAnimation.h>
</span><span class="lines">@@ -68,6 +71,8 @@
</span><span class="cx"> m_mediaElement->removeEventListener(eventNames().playEvent, this, false);
</span><span class="cx"> m_mediaElement->removeEventListener(eventNames().ratechangeEvent, this, false);
</span><span class="cx"> m_mediaElement->removeEventListener(eventNames().timeupdateEvent, this, false);
</span><ins>+ m_mediaElement->removeEventListener(eventNames().addtrackEvent, this, false);
+ m_mediaElement->removeEventListener(eventNames().removetrackEvent, this, false);
</ins><span class="cx"> }
</span><span class="cx"> m_isListening = false;
</span><span class="cx">
</span><span class="lines">@@ -81,19 +86,16 @@
</span><span class="cx"> m_mediaElement->addEventListener(eventNames().playEvent, this, false);
</span><span class="cx"> m_mediaElement->addEventListener(eventNames().ratechangeEvent, this, false);
</span><span class="cx"> m_mediaElement->addEventListener(eventNames().timeupdateEvent, this, false);
</span><ins>+ m_mediaElement->addEventListener(eventNames().addtrackEvent, this, false);
+ m_mediaElement->addEventListener(eventNames().removetrackEvent, this, false);
</ins><span class="cx"> m_isListening = true;
</span><span class="cx">
</span><span class="cx"> m_videoFullscreenInterface->setDuration(m_mediaElement->duration());
</span><span class="cx"> m_videoFullscreenInterface->setSeekableRanges(*m_mediaElement->seekable());
</span><span class="cx"> m_videoFullscreenInterface->setRate(!m_mediaElement->paused(), m_mediaElement->playbackRate());
</span><span class="cx">
</span><del>- Vector<String> legibleOptions;
-
- for (auto& textTrack : m_mediaElement->platformTextTracks())
- legibleOptions.append(textTrack->label());
-
- m_videoFullscreenInterface->setLegibleMediaSelectionOptions(legibleOptions, 0);
-
</del><ins>+ updateLegibleOptions();
+
</ins><span class="cx"> m_videoFullscreenInterface->setCurrentTime(m_mediaElement->currentTime(), [[NSProcessInfo processInfo] systemUptime]);
</span><span class="cx">
</span><span class="cx"> if (isHTMLVideoElement(m_mediaElement.get())) {
</span><span class="lines">@@ -120,7 +122,8 @@
</span><span class="cx"> m_videoFullscreenInterface->setCurrentTime(m_mediaElement->currentTime(), [[NSProcessInfo processInfo] systemUptime]);
</span><span class="cx"> // FIXME: 130788 - find a better event to update seekable ranges from.
</span><span class="cx"> m_videoFullscreenInterface->setSeekableRanges(*m_mediaElement->seekable());
</span><del>- }
</del><ins>+ } else if (event->type() == eventNames().addtrackEvent || event->type() == eventNames().removetrackEvent)
+ updateLegibleOptions();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenModelMediaElement::setVideoFullscreenLayer(PlatformLayer* videoLayer)
</span><span class="lines">@@ -211,12 +214,28 @@
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenModelMediaElement::selectLegibleMediaOption(uint64_t index)
</span><span class="cx"> {
</span><del>- RefPtr<PlatformTextTrack> platformTrack;
</del><ins>+ TextTrack* textTrack = nullptr;
</ins><span class="cx">
</span><del>- if (index < m_mediaElement->platformTextTracks().size())
- platformTrack = m_mediaElement->platformTextTracks()[static_cast<size_t>(index)];
</del><ins>+ if (index < m_legibleTracksForMenu.size())
+ textTrack = m_legibleTracksForMenu[static_cast<size_t>(index)].get();
</ins><span class="cx">
</span><del>- m_mediaElement->setSelectedTextTrack(platformTrack);
</del><ins>+ m_mediaElement->setSelectedTextTrack(textTrack);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebVideoFullscreenModelMediaElement::updateLegibleOptions()
+{
+ TextTrackList* trackList = m_mediaElement->textTracks();
+ if (!trackList || !trackList->length() || !m_mediaElement->document().page())
+ return;
+
+ CaptionUserPreferences& captionPreferences = *m_mediaElement->document().page()->group().captionPreferences();
+ m_legibleTracksForMenu = captionPreferences.sortedTrackListForMenu(trackList);
+
+ Vector<String> legibleOptions;
+ for (auto& track : m_legibleTracksForMenu)
+ legibleOptions.append(captionPreferences.displayNameForTrack(track.get()));
+
+ m_videoFullscreenInterface->setLegibleMediaSelectionOptions(legibleOptions, 0);
+}
+
</ins><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>