<!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>[168245] 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/168245">168245</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-05-04 14:01:23 -0700 (Sun, 04 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] deviceScaleFactor is being double-applied when rendering captions in full screen mode
https://bugs.webkit.org/show_bug.cgi?id=132481
<rdar://problem/16507482>
Reviewed by Jer Noble.
Add a new 'syncTextTrackBounds' method (and relaying functions) to keep the text track container in sync
with changes to the video player's display layer.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::syncTextTrackBounds: Added.
* html/HTMLMediaElement.h:
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlTextTrackContainerElement::updateDisplay): Don't set the platform scale factor here. It is already
being accounted for in the createTextTrackRepresentationImage method.
(WebCore::MediaControlTextTrackContainerElement::updateSizes): Synchronize the text track representation
with any new video layer changes.
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::syncTextTrackBounds): Added.
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::syncTextTrackBounds): Added.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer): Use new sync function.
(WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenFrame): Ditto.
(WebCore::MediaPlayerPrivateAVFoundationObjC::syncTextTrackBounds): Added. Keep the text track layer size in sync with
the current video layer size. This may change during animations, rotations, etc.
(WebCore::MediaPlayerPrivateAVFoundationObjC::setTextTrackRepresentation): Use new sync function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</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 (168244 => 168245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-04 20:40:40 UTC (rev 168244)
+++ trunk/Source/WebCore/ChangeLog 2014-05-04 21:01:23 UTC (rev 168245)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-05-04 Brent Fulgham <bfulgham@apple.com>
+
+ [iOS] deviceScaleFactor is being double-applied when rendering captions in full screen mode
+ https://bugs.webkit.org/show_bug.cgi?id=132481
+ <rdar://problem/16507482>
+
+ Reviewed by Jer Noble.
+
+ Add a new 'syncTextTrackBounds' method (and relaying functions) to keep the text track container in sync
+ with changes to the video player's display layer.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::syncTextTrackBounds: Added.
+ * html/HTMLMediaElement.h:
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlTextTrackContainerElement::updateDisplay): Don't set the platform scale factor here. It is already
+ being accounted for in the createTextTrackRepresentationImage method.
+ (WebCore::MediaControlTextTrackContainerElement::updateSizes): Synchronize the text track representation
+ with any new video layer changes.
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::syncTextTrackBounds): Added.
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::syncTextTrackBounds): Added.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer): Use new sync function.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenFrame): Ditto.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::syncTextTrackBounds): Added. Keep the text track layer size in sync with
+ the current video layer size. This may change during animations, rotations, etc.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setTextTrackRepresentation): Use new sync function.
+
</ins><span class="cx"> 2014-05-04 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Top content inset: Margin tiles should not display in the inset area when pinned
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (168244 => 168245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-04 20:40:40 UTC (rev 168244)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-05-04 21:01:23 UTC (rev 168245)
</span><span class="lines">@@ -4710,6 +4710,12 @@
</span><span class="cx"> if (m_player)
</span><span class="cx"> m_player->setTextTrackRepresentation(representation);
</span><span class="cx"> }
</span><ins>+
+void HTMLMediaElement::syncTextTrackBounds()
+{
+ if (m_player)
+ m_player->syncTextTrackBounds();
+}
</ins><span class="cx"> #endif // ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_AIRPLAY)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (168244 => 168245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-05-04 20:40:40 UTC (rev 168244)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-05-04 21:01:23 UTC (rev 168245)
</span><span class="lines">@@ -352,6 +352,7 @@
</span><span class="cx">
</span><span class="cx"> bool requiresTextTrackRepresentation() const;
</span><span class="cx"> void setTextTrackRepresentation(TextTrackRepresentation*);
</span><ins>+ void syncTextTrackBounds();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_AIRPLAY)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (168244 => 168245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-05-04 20:40:40 UTC (rev 168244)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-05-04 21:01:23 UTC (rev 168245)
</span><span class="lines">@@ -1358,9 +1358,6 @@
</span><span class="cx"> m_textTrackRepresentation = TextTrackRepresentation::create(this);
</span><span class="cx"> mediaElement->setTextTrackRepresentation(m_textTrackRepresentation.get());
</span><span class="cx">
</span><del>- if (Page* page = document().page())
- m_textTrackRepresentation->setContentScale(page->deviceScaleFactor());
-
</del><span class="cx"> m_textTrackRepresentation->update();
</span><span class="cx"> setInlineStyleProperty(CSSPropertyWidth, m_videoDisplaySize.size().width(), CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyHeight, m_videoDisplaySize.size().height(), CSSPrimitiveValue::CSS_PX);
</span><span class="lines">@@ -1432,6 +1429,8 @@
</span><span class="cx"> if (!document().page())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ mediaElement->syncTextTrackBounds();
+
</ins><span class="cx"> IntRect videoBox;
</span><span class="cx">
</span><span class="cx"> if (m_textTrackRepresentation)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (168244 => 168245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-05-04 20:40:40 UTC (rev 168244)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2014-05-04 21:01:23 UTC (rev 168245)
</span><span class="lines">@@ -1265,6 +1265,11 @@
</span><span class="cx"> m_private->setTextTrackRepresentation(representation);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayer::syncTextTrackBounds()
+{
+ m_private->syncTextTrackBounds();
+}
+
</ins><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span><span class="cx"> void MediaPlayer::notifyTrackModeChanged()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (168244 => 168245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-05-04 20:40:40 UTC (rev 168244)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2014-05-04 21:01:23 UTC (rev 168245)
</span><span class="lines">@@ -542,6 +542,7 @@
</span><span class="cx">
</span><span class="cx"> bool requiresTextTrackRepresentation() const;
</span><span class="cx"> void setTextTrackRepresentation(TextTrackRepresentation*);
</span><ins>+ void syncTextTrackBounds();
</ins><span class="cx"> #if ENABLE(AVF_CAPTIONS)
</span><span class="cx"> void notifyTrackModeChanged();
</span><span class="cx"> Vector<RefPtr<PlatformTextTrack>> outOfBandTrackSources();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (168244 => 168245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-05-04 20:40:40 UTC (rev 168244)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2014-05-04 21:01:23 UTC (rev 168245)
</span><span class="lines">@@ -223,6 +223,7 @@
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> virtual bool requiresTextTrackRepresentation() const { return false; }
</span><span class="cx"> virtual void setTextTrackRepresentation(TextTrackRepresentation*) { }
</span><ins>+ virtual void syncTextTrackBounds() { };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(PLATFORM_TEXT_TRACK_MENU)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (168244 => 168245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-05-04 20:40:40 UTC (rev 168244)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-05-04 21:01:23 UTC (rev 168245)
</span><span class="lines">@@ -203,6 +203,7 @@
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> virtual bool requiresTextTrackRepresentation() const override;
</span><span class="cx"> virtual void setTextTrackRepresentation(TextTrackRepresentation*) override;
</span><ins>+ virtual void syncTextTrackBounds() override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void createImageGenerator();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (168244 => 168245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-05-04 20:40:40 UTC (rev 168244)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-05-04 21:01:23 UTC (rev 168245)
</span><span class="lines">@@ -861,16 +861,14 @@
</span><span class="cx">
</span><span class="cx"> m_videoFullscreenLayer = videoFullscreenLayer;
</span><span class="cx">
</span><del>- CGRect frame = CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height());
-
</del><span class="cx"> if (m_videoFullscreenLayer && m_videoLayer) {
</span><ins>+ CGRect frame = CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height());
</ins><span class="cx"> [m_videoLayer setFrame:frame];
</span><span class="cx"> [m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_videoFullscreenLayer && m_textTrackRepresentationLayer) {
</span><del>- CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : frame;
- [m_textTrackRepresentationLayer setFrame:textFrame];
</del><ins>+ syncTextTrackBounds();
</ins><span class="cx"> [m_videoFullscreenLayer addSublayer:m_textTrackRepresentationLayer.get()];
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -884,10 +882,7 @@
</span><span class="cx"> if (m_videoLayer)
</span><span class="cx"> [m_videoLayer setFrame:CGRectMake(0, 0, frame.width(), frame.height())];
</span><span class="cx">
</span><del>- if (m_textTrackRepresentationLayer) {
- CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : static_cast<CGRect>(frame);
- [m_textTrackRepresentationLayer setFrame:textFrame];
- }
</del><ins>+ syncTextTrackBounds();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenGravity(MediaPlayer::VideoGravity gravity)
</span><span class="lines">@@ -1593,12 +1588,25 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlayerPrivateAVFoundationObjC::syncTextTrackBounds()
+{
+#if PLATFORM(IOS)
+ if (!m_videoFullscreenLayer || !m_textTrackRepresentationLayer)
+ return;
+
+ CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height());
+ [m_textTrackRepresentationLayer setFrame:textFrame];
+#endif
+}
+
</ins><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::setTextTrackRepresentation(TextTrackRepresentation* representation)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> PlatformLayer* representationLayer = representation ? representation->platformLayer() : nil;
</span><del>- if (representationLayer == m_textTrackRepresentationLayer)
</del><ins>+ if (representationLayer == m_textTrackRepresentationLayer) {
+ syncTextTrackBounds();
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if (m_textTrackRepresentationLayer)
</span><span class="cx"> [m_textTrackRepresentationLayer removeFromSuperlayer];
</span><span class="lines">@@ -1606,9 +1614,7 @@
</span><span class="cx"> m_textTrackRepresentationLayer = representationLayer;
</span><span class="cx">
</span><span class="cx"> if (m_videoFullscreenLayer && m_textTrackRepresentationLayer) {
</span><del>- CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height());
-
- [m_textTrackRepresentationLayer setFrame:textFrame];
</del><ins>+ syncTextTrackBounds();
</ins><span class="cx"> [m_videoFullscreenLayer addSublayer:m_textTrackRepresentationLayer.get()];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>