<!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>[172481] 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/172481">172481</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2014-08-12 11:52:16 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adjust max-width of cues based on text alignment when cue size is expanded.
https://bugs.webkit.org/show_bug.cgi?id=135823.
Reviewed by Brent Fulgham.
All units are in percentages.
If we are left aligned the max cue width is the 100 minus the cue position.
If we are right aligned the max cue width is the cue position.
If we are centered the max cue width is just 100.
* html/track/TextTrackCueGeneric.cpp:
(WebCore::TextTrackCueGenericBoxElement::applyCSSProperties):
* html/track/VTTCue.cpp:
(WebCore::VTTCueBox::applyCSSProperties):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackCueGenericcpp">trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTCuecpp">trunk/Source/WebCore/html/track/VTTCue.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172480 => 172481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-12 17:50:06 UTC (rev 172480)
+++ trunk/Source/WebCore/ChangeLog 2014-08-12 18:52:16 UTC (rev 172481)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-08-11 Roger Fong <roger_fong@apple.com>
+
+ Adjust max-width of cues based on text alignment when cue size is expanded.
+ https://bugs.webkit.org/show_bug.cgi?id=135823.
+
+ Reviewed by Brent Fulgham.
+
+ All units are in percentages.
+ If we are left aligned the max cue width is the 100 minus the cue position.
+ If we are right aligned the max cue width is the cue position.
+ If we are centered the max cue width is just 100.
+
+ * html/track/TextTrackCueGeneric.cpp:
+ (WebCore::TextTrackCueGenericBoxElement::applyCSSProperties):
+ * html/track/VTTCue.cpp:
+ (WebCore::VTTCueBox::applyCSSProperties):
+
</ins><span class="cx"> 2014-08-12 Fabien Vallée <fvallee@connected-labs.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] playback rate is rounded to integer
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackCueGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp (172480 => 172481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2014-08-12 17:50:06 UTC (rev 172480)
+++ trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2014-08-12 18:52:16 UTC (rev 172481)
</span><span class="lines">@@ -102,13 +102,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- std::pair<float, float> position = m_cue.getCSSPosition();
</del><ins>+ double textPosition = m_cue.position();
+ double maxSize = 100.0;
+
+ if (alignment == CSSValueEnd || alignment == CSSValueRight)
+ maxSize = textPosition;
+ else if (alignment == CSSValueStart || alignment == CSSValueLeft)
+ maxSize = 100.0 - textPosition;
+
</ins><span class="cx"> if (cue->getWritingDirection() == VTTCue::Horizontal) {
</span><span class="cx"> setInlineStyleProperty(CSSPropertyMinWidth, "-webkit-min-content");
</span><del>- setInlineStyleProperty(CSSPropertyMaxWidth, 100.0 - position.first, CSSPrimitiveValue::CSS_PERCENTAGE);
</del><ins>+ setInlineStyleProperty(CSSPropertyMaxWidth, maxSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> } else {
</span><span class="cx"> setInlineStyleProperty(CSSPropertyMinHeight, "-webkit-min-content");
</span><del>- setInlineStyleProperty(CSSPropertyMaxHeight, 100.0 - position.second, CSSPrimitiveValue::CSS_PERCENTAGE);
</del><ins>+ setInlineStyleProperty(CSSPropertyMaxHeight, maxSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (cue->foregroundColor().isValid())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTCuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTCue.cpp (172480 => 172481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VTTCue.cpp 2014-08-12 17:50:06 UTC (rev 172480)
+++ trunk/Source/WebCore/html/track/VTTCue.cpp 2014-08-12 18:52:16 UTC (rev 172481)
</span><span class="lines">@@ -178,21 +178,28 @@
</span><span class="cx"> if (authorFontSize)
</span><span class="cx"> multiplier = m_fontSizeFromCaptionUserPrefs / authorFontSize;
</span><span class="cx">
</span><ins>+ double textPosition = m_cue.position();
+ double maxSize = 100.0;
+ CSSValueID alignment = m_cue.getCSSAlignment();
+ if (alignment == CSSValueEnd || alignment == CSSValueRight)
+ maxSize = textPosition;
+ else if (alignment == CSSValueStart || alignment == CSSValueLeft)
+ maxSize = 100.0 - textPosition;
+
</ins><span class="cx"> double newCueSize = std::min(m_cue.getCSSSize() * multiplier, 100.0);
</span><del>- CSSValueID alignment = m_cue.getCSSAlignment();
</del><span class="cx"> // the 'width' property must be set to width, and the 'height' property must be set to height
</span><span class="cx"> if (m_cue.vertical() == horizontalKeyword()) {
</span><span class="cx"> setInlineStyleProperty(CSSPropertyWidth, newCueSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyHeight, CSSValueAuto);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyMinWidth, "-webkit-min-content");
</span><del>- setInlineStyleProperty(CSSPropertyMaxWidth, 100.0 - position.first, CSSPrimitiveValue::CSS_PERCENTAGE);
</del><ins>+ setInlineStyleProperty(CSSPropertyMaxWidth, maxSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> if ((alignment == CSSValueMiddle || alignment == CSSValueCenter) && multiplier != 1.0)
</span><span class="cx"> setInlineStyleProperty(CSSPropertyLeft, static_cast<double>(position.first - (newCueSize - m_cue.getCSSSize()) / 2), CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> } else {
</span><span class="cx"> setInlineStyleProperty(CSSPropertyWidth, CSSValueAuto);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyHeight, newCueSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyMinHeight, "-webkit-min-content");
</span><del>- setInlineStyleProperty(CSSPropertyMaxHeight, 100.0 - position.second, CSSPrimitiveValue::CSS_PERCENTAGE);
</del><ins>+ setInlineStyleProperty(CSSPropertyMaxHeight, maxSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> if ((alignment == CSSValueMiddle || alignment == CSSValueCenter) && multiplier != 1.0)
</span><span class="cx"> setInlineStyleProperty(CSSPropertyTop, static_cast<double>(position.second - (newCueSize - m_cue.getCSSSize()) / 2), CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>