<!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>[172464] branches/safari-600.1-branch/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/172464">172464</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-12 07:11:17 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172421">r172421</a>. <rdar://problem/17961164></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCorehtmltrackTextTrackCueGenericcpp">branches/safari-600.1-branch/Source/WebCore/html/track/TextTrackCueGeneric.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCorehtmltrackVTTCuecpp">branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCorehtmltrackVTTCueh">branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172463 => 172464)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-12 14:06:21 UTC (rev 172463)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-12 14:11:17 UTC (rev 172464)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-08-12 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172421
+
+ 2014-08-11 Roger Fong <roger_fong@apple.com>
+
+ Adjustments to CueBox CSS Width calculations Part 2.
+ https://bugs.webkit.org/show_bug.cgi?id=135820
+ <rdar://problem/17954473>.
+
+ Reviewed by Brent Fulgham.
+
+ Two adjustments made:
+ a) The default font size used was incorrect. It is not just 10px,
+ but should be based off a percentage of the video size.
+ b) The top/left CSS property needs to be adjusted appropriately if the cue
+ is center aligned and we change the cue's size such that the cue remains centered.
+ * html/track/TextTrackCueGeneric.cpp:
+ (WebCore::TextTrackCueGenericBoxElement::applyCSSProperties):
+ * html/track/VTTCue.cpp:
+ (WebCore::VTTCueBox::applyCSSProperties):
+ * html/track/VTTCue.h: Remove unnecessary constant.
+
+2014-08-12 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r172417
</span><span class="cx">
</span><span class="cx"> 2014-08-11 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorehtmltrackTextTrackCueGenericcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/html/track/TextTrackCueGeneric.cpp (172463 => 172464)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2014-08-12 14:06:21 UTC (rev 172463)
+++ branches/safari-600.1-branch/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2014-08-12 14:11:17 UTC (rev 172464)
</span><span class="lines">@@ -44,6 +44,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+// This default value must be the same as the one specified in mediaControlsApple.css for -webkit-media-controls-closed-captions-container
+const static int DEFAULTCAPTIONFONTSIZE = 10;
+
</ins><span class="cx"> class TextTrackCueGenericBoxElement final : public VTTCueBox {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<TextTrackCueGenericBoxElement> create(Document& document, TextTrackCueGeneric& cue)
</span><span class="lines">@@ -70,6 +73,7 @@
</span><span class="cx"> TextTrackCueGeneric* cue = static_cast<TextTrackCueGeneric*>(getCue());
</span><span class="cx"> RefPtr<HTMLSpanElement> cueElement = cue->element();
</span><span class="cx">
</span><ins>+ CSSValueID alignment = cue->getCSSAlignment();
</ins><span class="cx"> float size = static_cast<float>(cue->getCSSSize());
</span><span class="cx"> if (cue->useDefaultPosition()) {
</span><span class="cx"> setInlineStyleProperty(CSSPropertyBottom, 0, CSSPrimitiveValue::CSS_PX);
</span><span class="lines">@@ -78,15 +82,24 @@
</span><span class="cx"> setInlineStyleProperty(CSSPropertyLeft, static_cast<float>(cue->position()), CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyTop, static_cast<float>(cue->line()), CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx">
</span><del>- double authorFontSize = std::max(DEFAULTCAPTIONFONTSIZE, videoSize.height() * cue->baseFontSizeRelativeToVideoHeight() / 100.0);
</del><ins>+ double authorFontSize = videoSize.height() * cue->baseFontSizeRelativeToVideoHeight() / 100.0;
+ if (!authorFontSize)
+ authorFontSize = DEFAULTCAPTIONFONTSIZE;
+
</ins><span class="cx"> if (cue->fontSizeMultiplier())
</span><span class="cx"> authorFontSize *= cue->fontSizeMultiplier() / 100;
</span><span class="cx">
</span><del>- double multiplier = std::max(1.0, m_fontSizeFromCaptionUserPrefs / authorFontSize);
- if (cue->getWritingDirection() == VTTCue::Horizontal)
- setInlineStyleProperty(CSSPropertyWidth, std::min(size * multiplier, 100.0), CSSPrimitiveValue::CSS_PERCENTAGE);
- else
- setInlineStyleProperty(CSSPropertyHeight, std::min(size * multiplier, 100.0), CSSPrimitiveValue::CSS_PERCENTAGE);
</del><ins>+ double multiplier = m_fontSizeFromCaptionUserPrefs / authorFontSize;
+ double newCueSize = std::min(size * multiplier, 100.0);
+ if (cue->getWritingDirection() == VTTCue::Horizontal) {
+ setInlineStyleProperty(CSSPropertyWidth, newCueSize, CSSPrimitiveValue::CSS_PERCENTAGE);
+ if ((alignment == CSSValueMiddle || alignment == CSSValueCenter) && multiplier != 1.0)
+ setInlineStyleProperty(CSSPropertyLeft, static_cast<double>(cue->position() - (newCueSize - m_cue.getCSSSize()) / 2), CSSPrimitiveValue::CSS_PERCENTAGE);
+ } else {
+ setInlineStyleProperty(CSSPropertyHeight, newCueSize, CSSPrimitiveValue::CSS_PERCENTAGE);
+ if ((alignment == CSSValueMiddle || alignment == CSSValueCenter) && multiplier != 1.0)
+ setInlineStyleProperty(CSSPropertyTop, static_cast<double>(cue->line() - (newCueSize - m_cue.getCSSSize()) / 2), CSSPrimitiveValue::CSS_PERCENTAGE);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::pair<float, float> position = m_cue.getCSSPosition();
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorehtmltrackVTTCuecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp (172463 => 172464)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp 2014-08-12 14:06:21 UTC (rev 172463)
+++ branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp 2014-08-12 14:11:17 UTC (rev 172464)
</span><span class="lines">@@ -58,6 +58,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+// This constant should correspond with the percentage returned by CaptionUserPreferences::captionFontSizeScaleAndImportance.
+const static double DEFAULTCAPTIONFONTSIZEPERCENTAGE = 5;
+
</ins><span class="cx"> static const int undefinedPosition = -1;
</span><span class="cx">
</span><span class="cx"> static const CSSValueID displayWritingModeMap[] = {
</span><span class="lines">@@ -138,7 +141,7 @@
</span><span class="cx"> return &m_cue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void VTTCueBox::applyCSSProperties(const IntSize&)
</del><ins>+void VTTCueBox::applyCSSProperties(const IntSize& videoSize)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Apply all the initial CSS positioning properties. http://wkb.ug/79916
</span><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><span class="lines">@@ -170,18 +173,28 @@
</span><span class="cx"> // the 'left' property must be set to left
</span><span class="cx"> setInlineStyleProperty(CSSPropertyLeft, static_cast<double>(position.first), CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx">
</span><del>- double multiplier = std::max(1.0, m_fontSizeFromCaptionUserPrefs / DEFAULTCAPTIONFONTSIZE);
</del><ins>+ double authorFontSize = std::min(videoSize.width(), videoSize.height()) * DEFAULTCAPTIONFONTSIZEPERCENTAGE / 100.0;
+ double multiplier = 1.0;
+ if (authorFontSize)
+ multiplier = m_fontSizeFromCaptionUserPrefs / authorFontSize;
+
+ double newCueSize = std::min(m_cue.getCSSSize() * multiplier, 100.0);
+ CSSValueID alignment = m_cue.getCSSAlignment();
</ins><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><del>- setInlineStyleProperty(CSSPropertyWidth, std::min(m_cue.getCSSSize() * multiplier, 100.0), CSSPrimitiveValue::CSS_PERCENTAGE);
</del><ins>+ setInlineStyleProperty(CSSPropertyWidth, newCueSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> setInlineStyleProperty(CSSPropertyHeight, CSSValueAuto);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyMinWidth, "-webkit-min-content");
</span><span class="cx"> setInlineStyleProperty(CSSPropertyMaxWidth, 100.0 - position.first, CSSPrimitiveValue::CSS_PERCENTAGE);
</span><ins>+ if ((alignment == CSSValueMiddle || alignment == CSSValueCenter) && multiplier != 1.0)
+ setInlineStyleProperty(CSSPropertyLeft, static_cast<double>(position.first - (newCueSize - m_cue.getCSSSize()) / 2), CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> } else {
</span><span class="cx"> setInlineStyleProperty(CSSPropertyWidth, CSSValueAuto);
</span><del>- setInlineStyleProperty(CSSPropertyHeight, std::min(m_cue.getCSSSize() * multiplier, 100.0), CSSPrimitiveValue::CSS_PERCENTAGE);
</del><ins>+ setInlineStyleProperty(CSSPropertyHeight, newCueSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> setInlineStyleProperty(CSSPropertyMinHeight, "-webkit-min-content");
</span><span class="cx"> setInlineStyleProperty(CSSPropertyMaxHeight, 100.0 - position.second, CSSPrimitiveValue::CSS_PERCENTAGE);
</span><ins>+ if ((alignment == CSSValueMiddle || alignment == CSSValueCenter) && multiplier != 1.0)
+ setInlineStyleProperty(CSSPropertyTop, static_cast<double>(position.second - (newCueSize - m_cue.getCSSSize()) / 2), CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The 'text-align' property on the (root) List of WebVTT Node Objects must
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorehtmltrackVTTCueh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.h (172463 => 172464)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.h 2014-08-12 14:06:21 UTC (rev 172463)
+++ branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.h 2014-08-12 14:11:17 UTC (rev 172464)
</span><span class="lines">@@ -49,9 +49,6 @@
</span><span class="cx"> class VTTScanner;
</span><span class="cx"> class WebVTTCueData;
</span><span class="cx">
</span><del>-// This default value must be the same as the one specified in mediaControlsApple.css for -webkit-media-controls-closed-captions-container
-const static double DEFAULTCAPTIONFONTSIZE = 10;
-
</del><span class="cx"> // ----------------------------
</span><span class="cx">
</span><span class="cx"> class VTTCueBox : public HTMLElement {
</span></span></pre>
</div>
</div>
</body>
</html>