<!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>[166268] 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/166268">166268</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-03-25 16:43:13 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Enable caption support in full screen.
https://bugs.webkit.org/show_bug.cgi?id=130603
Reviewed by Eric Carlson.
Add TextTrackRepresentation support to MediaPlayerPrivateAVFoundationObjC.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer): Add the m_textTrackRepresenationLayer if present.
(WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer): Ditto.
(WebCore::MediaPlayerPrivateAVFoundationObjC::requiresTextTrackRepresentation): True, if a m_videoFullscreenLayer is present.
(WebCore::MediaPlayerPrivateAVFoundationObjC::setTextTrackRepresentation): Remove the old, and add the new m_textTrackRepresenationLayer.
Make the text track container a stacking context for painting purposes.
* Modules/mediacontrols/mediaControlsiOS.css:
(video::-webkit-media-text-track-container):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOScss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166267 => 166268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-25 23:37:01 UTC (rev 166267)
+++ trunk/Source/WebCore/ChangeLog 2014-03-25 23:43:13 UTC (rev 166268)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-03-21 Jer Noble <jer.noble@apple.com>
+
+ [iOS] Enable caption support in full screen.
+ https://bugs.webkit.org/show_bug.cgi?id=130603
+
+ Reviewed by Eric Carlson.
+
+ Add TextTrackRepresentation support to MediaPlayerPrivateAVFoundationObjC.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer): Add the m_textTrackRepresenationLayer if present.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer): Ditto.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::requiresTextTrackRepresentation): True, if a m_videoFullscreenLayer is present.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setTextTrackRepresentation): Remove the old, and add the new m_textTrackRepresenationLayer.
+
+ Make the text track container a stacking context for painting purposes.
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (video::-webkit-media-text-track-container):
+
</ins><span class="cx"> 2014-03-25 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Replay: resource unique identifiers should be unique-per-frame, not globally
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOScss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (166267 => 166268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2014-03-25 23:37:01 UTC (rev 166267)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2014-03-25 23:43:13 UTC (rev 166268)
</span><span class="lines">@@ -295,6 +295,7 @@
</span><span class="cx"> width: 100%;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> padding-bottom: 5px;
</span><ins>+ z-index: 0;
</ins><span class="cx">
</span><span class="cx"> text-align: center;
</span><span class="cx"> color: rgba(255, 255, 255, 1);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (166267 => 166268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-03-25 23:37:01 UTC (rev 166267)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-03-25 23:43:13 UTC (rev 166268)
</span><span class="lines">@@ -190,7 +190,12 @@
</span><span class="cx"> virtual void updateVideoLayerGravity() override;
</span><span class="cx">
</span><span class="cx"> virtual bool hasSingleSecurityOrigin() const;
</span><del>-
</del><ins>+
+#if ENABLE(VIDEO_TRACK)
+ virtual bool requiresTextTrackRepresentation() const override;
+ virtual void setTextTrackRepresentation(TextTrackRepresentation*) override;
+#endif
+
</ins><span class="cx"> void createImageGenerator();
</span><span class="cx"> void destroyImageGenerator();
</span><span class="cx"> RetainPtr<CGImageRef> createImageForTimeInRect(float, const IntRect&);
</span><span class="lines">@@ -254,6 +259,7 @@
</span><span class="cx"> RetainPtr<PlatformLayer> m_videoFullscreenLayer;
</span><span class="cx"> FloatRect m_videoFullscreenFrame;
</span><span class="cx"> MediaPlayer::VideoGravity m_videoFullscreenGravity;
</span><ins>+ RetainPtr<PlatformLayer> m_textTrackRepresentationLayer;
</ins><span class="cx"> #endif
</span><span class="cx"> RetainPtr<WebCoreAVFMovieObserver> m_objcObserver;
</span><span class="cx"> RetainPtr<id> m_timeObserver;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (166267 => 166268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-03-25 23:37:01 UTC (rev 166267)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-03-25 23:43:13 UTC (rev 166268)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #import "PlatformTimeRanges.h"
</span><span class="cx"> #import "SecurityOrigin.h"
</span><span class="cx"> #import "SoftLinking.h"
</span><ins>+#import "TextTrackRepresentation.h"
</ins><span class="cx"> #import "UUID.h"
</span><span class="cx"> #import "VideoTrackPrivateAVFObjC.h"
</span><span class="cx"> #import "WebCoreAVFResourceLoader.h"
</span><span class="lines">@@ -511,7 +512,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (m_videoFullscreenLayer) {
</span><span class="cx"> [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
</span><del>- [m_videoFullscreenLayer addSublayer:m_videoLayer.get()];
</del><ins>+ [m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> player()->mediaPlayerClient()->mediaPlayerRenderingModeChanged(player());
</span><span class="lines">@@ -799,20 +800,33 @@
</span><span class="cx">
</span><span class="cx"> m_videoFullscreenLayer = videoFullscreenLayer;
</span><span class="cx">
</span><del>- if (!m_videoFullscreenLayer || !m_videoLayer)
- return;
</del><ins>+ CGRect frame = CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height());
</ins><span class="cx">
</span><del>- [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
- [m_videoFullscreenLayer addSublayer:m_videoLayer.get()];
</del><ins>+ if (m_videoFullscreenLayer && m_videoLayer) {
+ [m_videoLayer setFrame:frame];
+ [m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
+ }
+
+ if (m_videoFullscreenLayer && m_textTrackRepresentationLayer) {
+ CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : frame;
+ [m_textTrackRepresentationLayer setFrame:textFrame];
+ [m_videoFullscreenLayer addSublayer:m_textTrackRepresentationLayer.get()];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenFrame(FloatRect frame)
</span><span class="cx"> {
</span><span class="cx"> m_videoFullscreenFrame = frame;
</span><del>- if (!m_videoFullscreenLayer || !m_videoLayer)
</del><ins>+ if (!m_videoFullscreenLayer)
</ins><span class="cx"> return;
</span><del>-
- [m_videoLayer setFrame:CGRectMake(0, 0, frame.width(), frame.height())];
</del><ins>+
+ if (m_videoLayer)
+ [m_videoLayer setFrame:CGRectMake(0, 0, frame.width(), frame.height())];
+
+ if (m_textTrackRepresentationLayer) {
+ CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : static_cast<CGRect>(frame);
+ [m_textTrackRepresentationLayer setFrame:textFrame];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenGravity(MediaPlayer::VideoGravity gravity)
</span><span class="lines">@@ -1466,6 +1480,39 @@
</span><span class="cx"> {
</span><span class="cx"> determineChangedTracksFromNewTracksAndOldItems(m_cachedTracks.get(), AVMediaTypeVideo, m_videoTracks, &VideoTrackPrivateAVFObjC::create, player(), &MediaPlayer::removeVideoTrack, &MediaPlayer::addVideoTrack);
</span><span class="cx"> }
</span><ins>+
+bool MediaPlayerPrivateAVFoundationObjC::requiresTextTrackRepresentation() const
+{
+#if PLATFORM(IOS)
+ if (m_videoFullscreenLayer)
+ return true;
+#endif
+ return false;
+}
+
+void MediaPlayerPrivateAVFoundationObjC::setTextTrackRepresentation(TextTrackRepresentation* representation)
+{
+#if PLATFORM(IOS)
+ PlatformLayer* representationLayer = representation ? representation->platformLayer() : nil;
+ if (representationLayer == m_textTrackRepresentationLayer)
+ return;
+
+ if (m_textTrackRepresentationLayer)
+ [m_textTrackRepresentationLayer removeFromSuperlayer];
+
+ m_textTrackRepresentationLayer = representationLayer;
+
+ if (m_videoFullscreenLayer && m_textTrackRepresentationLayer) {
+ CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height());
+
+ [m_textTrackRepresentationLayer setFrame:textFrame];
+ [m_videoFullscreenLayer addSublayer:m_textTrackRepresentationLayer.get()];
+ }
+
+#else
+ UNUSED_PARAM(representation);
+#endif
+}
</ins><span class="cx"> #endif // ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::sizeChanged()
</span></span></pre>
</div>
</div>
</body>
</html>