<!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>[169234] 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/169234">169234</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-22 18:04:43 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Captions layout incorrectly in fullscreen.
https://bugs.webkit.org/show_bug.cgi?id=133175
Patch by Jeremy Jones <jeremyj@apple.com> on 2014-05-22
Reviewed by Eric Carlson.
When doing layout for fullscreen, geometry should be absolute so it is not influenced
by the rest of the page. This change adds style for CSSPropertyPosition, CSSPropertyLeft,
and CSSPropertyTop.
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlTextTrackContainerElement::updateDisplay):
Refactor style changes into updateStyleForTextTrackRepresentation().
(WebCore::MediaControlTextTrackContainerElement::updateTimerFired):
Refactor style changes into updateStyleForTextTrackRepresentation().
(WebCore::MediaControlTextTrackContainerElement::clearTextTrackRepresentation):
Refactor style changes into updateStyleForTextTrackRepresentation().
(WebCore::MediaControlTextTrackContainerElement::updateStyleForTextTrackRepresentation):
Consolidate style changes here. Include the two existing and three new style changes.
* html/shadow/MediaControlElements.h:
Declare updateStyleForTextTrackRepresentation().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementsh">trunk/Source/WebCore/html/shadow/MediaControlElements.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169233 => 169234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-23 00:40:23 UTC (rev 169233)
+++ trunk/Source/WebCore/ChangeLog 2014-05-23 01:04:43 UTC (rev 169234)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-05-22 Jeremy Jones <jeremyj@apple.com>
+
+ Captions layout incorrectly in fullscreen.
+ https://bugs.webkit.org/show_bug.cgi?id=133175
+
+ Reviewed by Eric Carlson.
+
+ When doing layout for fullscreen, geometry should be absolute so it is not influenced
+ by the rest of the page. This change adds style for CSSPropertyPosition, CSSPropertyLeft,
+ and CSSPropertyTop.
+
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlTextTrackContainerElement::updateDisplay):
+ Refactor style changes into updateStyleForTextTrackRepresentation().
+ (WebCore::MediaControlTextTrackContainerElement::updateTimerFired):
+ Refactor style changes into updateStyleForTextTrackRepresentation().
+ (WebCore::MediaControlTextTrackContainerElement::clearTextTrackRepresentation):
+ Refactor style changes into updateStyleForTextTrackRepresentation().
+ (WebCore::MediaControlTextTrackContainerElement::updateStyleForTextTrackRepresentation):
+ Consolidate style changes here. Include the two existing and three new style changes.
+ * html/shadow/MediaControlElements.h:
+ Declare updateStyleForTextTrackRepresentation().
+
</ins><span class="cx"> 2014-05-22 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r155977): Very stuttery 3D css animation on jtechcommunications.com
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (169233 => 169234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-05-23 00:40:23 UTC (rev 169233)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-05-23 01:04:43 UTC (rev 169234)
</span><span class="lines">@@ -1359,8 +1359,7 @@
</span><span class="cx"> mediaElement->setTextTrackRepresentation(m_textTrackRepresentation.get());
</span><span class="cx">
</span><span class="cx"> m_textTrackRepresentation->update();
</span><del>- setInlineStyleProperty(CSSPropertyWidth, m_videoDisplaySize.size().width(), CSSPrimitiveValue::CSS_PX);
- setInlineStyleProperty(CSSPropertyHeight, m_videoDisplaySize.size().height(), CSSPrimitiveValue::CSS_PX);
</del><ins>+ updateStyleForTextTrackRepresentation();
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> hide();
</span><span class="lines">@@ -1373,11 +1372,9 @@
</span><span class="cx"> if (!document().page())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_textTrackRepresentation) {
- setInlineStyleProperty(CSSPropertyWidth, m_videoDisplaySize.size().width(), CSSPrimitiveValue::CSS_PX);
- setInlineStyleProperty(CSSPropertyHeight, m_videoDisplaySize.size().height(), CSSPrimitiveValue::CSS_PX);
- }
-
</del><ins>+ if (m_textTrackRepresentation)
+ updateStyleForTextTrackRepresentation();
+
</ins><span class="cx"> HTMLMediaElement* mediaElement = parentMediaElement(this);
</span><span class="cx"> if (!mediaElement)
</span><span class="cx"> return;
</span><span class="lines">@@ -1402,13 +1399,26 @@
</span><span class="cx"> if (HTMLMediaElement* mediaElement = parentMediaElement(this))
</span><span class="cx"> mediaElement->setTextTrackRepresentation(nullptr);
</span><span class="cx"> m_textTrackRepresentation = nullptr;
</span><del>- removeInlineStyleProperty(CSSPropertyPosition);
- removeInlineStyleProperty(CSSPropertyWidth);
- removeInlineStyleProperty(CSSPropertyHeight);
- removeInlineStyleProperty(CSSPropertyLeft);
- removeInlineStyleProperty(CSSPropertyTop);
</del><ins>+ updateStyleForTextTrackRepresentation();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaControlTextTrackContainerElement::updateStyleForTextTrackRepresentation()
+{
+ if (m_textTrackRepresentation) {
+ setInlineStyleProperty(CSSPropertyWidth, m_videoDisplaySize.size().width(), CSSPrimitiveValue::CSS_PX);
+ setInlineStyleProperty(CSSPropertyHeight, m_videoDisplaySize.size().height(), CSSPrimitiveValue::CSS_PX);
+ setInlineStyleProperty(CSSPropertyPosition, CSSValueAbsolute);
+ setInlineStyleProperty(CSSPropertyLeft, 0, CSSPrimitiveValue::CSS_PX);
+ setInlineStyleProperty(CSSPropertyTop, 0, CSSPrimitiveValue::CSS_PX);
+ } else {
+ removeInlineStyleProperty(CSSPropertyPosition);
+ removeInlineStyleProperty(CSSPropertyWidth);
+ removeInlineStyleProperty(CSSPropertyHeight);
+ removeInlineStyleProperty(CSSPropertyLeft);
+ removeInlineStyleProperty(CSSPropertyTop);
+ }
+}
+
</ins><span class="cx"> void MediaControlTextTrackContainerElement::enteredFullscreen()
</span><span class="cx"> {
</span><span class="cx"> updateSizes(true);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.h (169233 => 169234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.h 2014-05-23 00:40:23 UTC (rev 169233)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.h 2014-05-23 01:04:43 UTC (rev 169234)
</span><span class="lines">@@ -487,6 +487,7 @@
</span><span class="cx"> virtual PassRefPtr<Image> createTextTrackRepresentationImage() override;
</span><span class="cx"> virtual void textTrackRepresentationBoundsChanged(const IntRect&) override;
</span><span class="cx"> void clearTextTrackRepresentation();
</span><ins>+ void updateStyleForTextTrackRepresentation();
</ins><span class="cx"> OwnPtr<TextTrackRepresentation> m_textTrackRepresentation;
</span><span class="cx">
</span><span class="cx"> Timer<MediaControlTextTrackContainerElement> m_updateTimer;
</span></span></pre>
</div>
</div>
</body>
</html>