<!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>[172451] branches/safari-600.1-branch</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/172451">172451</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-12 06:30:32 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172351">r172351</a>. <rdar://problem/17961164></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<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="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (172450 => 172451)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-12 13:25:32 UTC (rev 172450)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-12 13:30:32 UTC (rev 172451)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-08-12 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172351
+
+ 2014-08-07 Roger Fong <roger_fong@apple.com>
+
+ Adjustments to CueBox CSS Width calculations.
+ https://bugs.webkit.org/show_bug.cgi?id=135759
+ <rdar://problem/17954473>.
+
+ Reviewed by Eric Carlson.
+
+ * TestExpectations:
+ Unskip tests media/track/track-cue-rendering-horizontal.html and media/track/track-cue-rendering-rtl.html.
+
</ins><span class="cx"> 2014-08-08 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172332
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172450 => 172451)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-12 13:25:32 UTC (rev 172450)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-12 13:30:32 UTC (rev 172451)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2014-08-12 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172351
+
+ 2014-08-08 Roger Fong <roger_fong@apple.com>
+
+ Adjustments to CueBox CSS Width calculations.
+ https://bugs.webkit.org/show_bug.cgi?id=135759
+ <rdar://problem/17954473>.
+
+ Reviewed by Eric Carlson.
+
+ This is a followup patch that addresses some of the test failures caused by r172224.
+ These tests were skipped in r172253.
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlTextTrackContainerElement::updateActiveCuesFontSize):
+ Tell the cue boxes that they need to be updated when the font size specified in the user prefs changes.
+
+ Cap width to 100%, calculate max-width in percentages instead of pixels.
+ * html/track/TextTrackCueGeneric.cpp:
+ (WebCore::TextTrackCueGenericBoxElement::applyCSSProperties):
+ * html/track/VTTCue.cpp:
+ (WebCore::VTTCueBox::applyCSSProperties):
+
+ (WebCore::VTTCue::setFontSize):
+ Remove some unnecessary code that doesn't actually work.
+ Make sure to tell cuebox that it needs to be updated.
+ * html/track/VTTCue.h: Change float constant to double.
+
+2014-08-12 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r172235
</span><span class="cx">
</span><span class="cx"> 2014-08-07 Gordon Sheridan <gordon_sheridan@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 (172450 => 172451)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2014-08-12 13:25:32 UTC (rev 172450)
+++ branches/safari-600.1-branch/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2014-08-12 13:30:32 UTC (rev 172451)
</span><span class="lines">@@ -78,26 +78,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>- float authorFontSize = std::max(DEFAULTCAPTIONFONTSIZE, static_cast<float>(videoSize.height() * cue->baseFontSizeRelativeToVideoHeight() / 100));
</del><ins>+ double authorFontSize = std::max(DEFAULTCAPTIONFONTSIZE, videoSize.height() * cue->baseFontSizeRelativeToVideoHeight() / 100.0);
</ins><span class="cx"> if (cue->fontSizeMultiplier())
</span><span class="cx"> authorFontSize *= cue->fontSizeMultiplier() / 100;
</span><span class="cx">
</span><del>- float multiplier = std::max(1.0f, m_fontSizeFromCaptionUserPrefs / authorFontSize);
</del><ins>+ double multiplier = std::max(1.0, m_fontSizeFromCaptionUserPrefs / authorFontSize);
</ins><span class="cx"> if (cue->getWritingDirection() == VTTCue::Horizontal)
</span><del>- setInlineStyleProperty(CSSPropertyWidth, size * multiplier, CSSPrimitiveValue::CSS_PERCENTAGE);
</del><ins>+ setInlineStyleProperty(CSSPropertyWidth, std::min(size * multiplier, 100.0), CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> else
</span><del>- setInlineStyleProperty(CSSPropertyHeight, size * multiplier, CSSPrimitiveValue::CSS_PERCENTAGE);
</del><ins>+ setInlineStyleProperty(CSSPropertyHeight, std::min(size * multiplier, 100.0), 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 class="cx"> if (cue->getWritingDirection() == VTTCue::Horizontal) {
</span><span class="cx"> setInlineStyleProperty(CSSPropertyMinWidth, "-webkit-min-content");
</span><del>- double maxWidth = videoSize.width() * (100.0 - position.first) / 100.0;
- setInlineStyleProperty(CSSPropertyMaxWidth, maxWidth, CSSPrimitiveValue::CSS_PX);
</del><ins>+ setInlineStyleProperty(CSSPropertyMaxWidth, 100.0 - position.first, CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> } else {
</span><span class="cx"> setInlineStyleProperty(CSSPropertyMinHeight, "-webkit-min-content");
</span><del>- double maxHeight = videoSize.height() * (100.0 - position.second) / 100.0;
- setInlineStyleProperty(CSSPropertyMaxHeight, maxHeight, CSSPrimitiveValue::CSS_PX);
</del><ins>+ setInlineStyleProperty(CSSPropertyMaxHeight, 100.0 - position.second, 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="branchessafari6001branchSourceWebCorehtmltrackVTTCuecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp (172450 => 172451)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp 2014-08-12 13:25:32 UTC (rev 172450)
+++ branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.cpp 2014-08-12 13:30:32 UTC (rev 172451)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> return &m_cue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void VTTCueBox::applyCSSProperties(const IntSize& videoSize)
</del><ins>+void VTTCueBox::applyCSSProperties(const IntSize&)
</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,20 +170,18 @@
</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>- float multiplier = std::max(1.0f, m_fontSizeFromCaptionUserPrefs / DEFAULTCAPTIONFONTSIZE);
</del><ins>+ double multiplier = std::max(1.0, m_fontSizeFromCaptionUserPrefs / DEFAULTCAPTIONFONTSIZE);
</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, static_cast<double>(m_cue.getCSSSize() * multiplier), CSSPrimitiveValue::CSS_PERCENTAGE);
</del><ins>+ setInlineStyleProperty(CSSPropertyWidth, std::min(m_cue.getCSSSize() * multiplier, 100.0), CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> setInlineStyleProperty(CSSPropertyHeight, CSSValueAuto);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyMinWidth, "-webkit-min-content");
</span><del>- double maxWidth = videoSize.width() * (100.0 - position.first) / 100.0;
- setInlineStyleProperty(CSSPropertyMaxWidth, maxWidth, CSSPrimitiveValue::CSS_PX);
</del><ins>+ setInlineStyleProperty(CSSPropertyMaxWidth, 100.0 - position.first, CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> } else {
</span><span class="cx"> setInlineStyleProperty(CSSPropertyWidth, CSSValueAuto);
</span><del>- setInlineStyleProperty(CSSPropertyHeight, static_cast<double>(m_cue.getCSSSize() * multiplier), CSSPrimitiveValue::CSS_PERCENTAGE);
</del><ins>+ setInlineStyleProperty(CSSPropertyHeight, std::min(m_cue.getCSSSize() * multiplier, 100.0), CSSPrimitiveValue::CSS_PERCENTAGE);
</ins><span class="cx"> setInlineStyleProperty(CSSPropertyMinHeight, "-webkit-min-content");
</span><del>- double maxHeight = videoSize.height() * (100.0 - position.second) / 100.0;
- setInlineStyleProperty(CSSPropertyMaxHeight, maxHeight, CSSPrimitiveValue::CSS_PX);
</del><ins>+ setInlineStyleProperty(CSSPropertyMaxHeight, 100.0 - position.second, 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 class="lines">@@ -1142,9 +1140,7 @@
</span><span class="cx">
</span><span class="cx"> LOG(Media, "TextTrackCue::setFontSize - setting cue font size to %i", fontSize);
</span><span class="cx">
</span><del>- if (important)
- displayTreeInternal()->setFontSizeFromCaptionUserPrefs(0);
-
</del><ins>+ m_displayTreeShouldChange = true;
</ins><span class="cx"> displayTreeInternal()->setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue::CSS_PX, important);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorehtmltrackVTTCueh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.h (172450 => 172451)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.h 2014-08-12 13:25:32 UTC (rev 172450)
+++ branches/safari-600.1-branch/Source/WebCore/html/track/VTTCue.h 2014-08-12 13:30:32 UTC (rev 172451)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> class WebVTTCueData;
</span><span class="cx">
</span><span class="cx"> // This default value must be the same as the one specified in mediaControlsApple.css for -webkit-media-controls-closed-captions-container
</span><del>-const static float DEFAULTCAPTIONFONTSIZE = 10;
</del><ins>+const static double DEFAULTCAPTIONFONTSIZE = 10;
</ins><span class="cx">
</span><span class="cx"> // ----------------------------
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>