<!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>[179994] branches/safari-600.5-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/179994">179994</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-02-12 09:37:26 -0800 (Thu, 12 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/179883">r179883</a>. rdar://problem/19790645</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestsChangeLog">branches/safari-600.5-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingInlineFlowBoxcpp">branches/safari-600.5-branch/Source/WebCore/rendering/InlineFlowBox.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingInlineFlowBoxh">branches/safari-600.5-branch/Source/WebCore/rendering/InlineFlowBox.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRootInlineBoxcpp">branches/safari-600.5-branch/Source/WebCore/rendering/RootInlineBox.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRootInlineBoxh">branches/safari-600.5-branch/Source/WebCore/rendering/RootInlineBox.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorestyleInlineTextBoxStylecpp">branches/safari-600.5-branch/Source/WebCore/style/InlineTextBoxStyle.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6005branchLayoutTestsfasttexttextunderlinepositionunderexpectedhtml">branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-position-under-expected.html</a></li>
<li><a href="#branchessafari6005branchLayoutTestsfasttexttextunderlinepositionunderhtml">branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-position-under.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (179993 => 179994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/ChangeLog        2015-02-12 17:20:07 UTC (rev 179993)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog        2015-02-12 17:37:26 UTC (rev 179994)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-02-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r179883. rdar://problem/19790645
+
+ 2015-02-09 David Hyatt <hyatt@apple.com>
+
+ text-underline-position: under is broken
+ https://bugs.webkit.org/show_bug.cgi?id=141400
+ <rdar://problem/18569583>
+
+ Reviewed by Simon Fraser.
+
+ * fast/text/text-underline-position-under-expected.html: Added.
+ * fast/text/text-underline-position-under.html: Added.
+
</ins><span class="cx"> 2015-02-11 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r177377
</span></span></pre></div>
<a id="branchessafari6005branchLayoutTestsfasttexttextunderlinepositionunderexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-position-under-expected.html (0 => 179994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-position-under-expected.html         (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-position-under-expected.html        2015-02-12 17:37:26 UTC (rev 179994)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!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" xmlns:ibooks="http://apple.com/ibooks/html-extensions" xmlns:epub="http://www.idpf.org/2007/ops">
+<head>
+<style>
+p{
+text-decoration: underline;
+-webkit-text-underline-position: under;
+float:left;
+margin:10px;
+background-color: #ddd;
+line-height:3.0;
+}
+.rl{
+-webkit-writing-mode:vertical-rl;
+}
+.lr{
+-webkit-writing-mode:vertical-lr;
+}
+</style>
+</head>
+<body>
+<p class="rl">「向見論治道書,其間欲仿井田之意,而科條州郡財賦之類<br/>
+,此固為治之具。然施之當有次第。今日先務,恐當啟迪主心</p>
+
+<p class="lr">「向見論治道書,其間欲仿井田之意,而科條州郡財賦之類<br/>
+,此固為治之具。然施之當有次第。今日先務,恐當啟迪主心</p>
+
+</body>
+</html>
+
</ins></span></pre></div>
<a id="branchessafari6005branchLayoutTestsfasttexttextunderlinepositionunderhtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-position-under.html (0 => 179994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-position-under.html         (rev 0)
+++ branches/safari-600.5-branch/LayoutTests/fast/text/text-underline-position-under.html        2015-02-12 17:37:26 UTC (rev 179994)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<?xml version="1.0" encoding="utf-8"?>
+<!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" xmlns:ibooks="http://apple.com/ibooks/html-extensions" xmlns:epub="http://www.idpf.org/2007/ops">
+<head>
+<style>
+p{
+text-decoration: underline;
+-webkit-text-underline-position: under;
+float:left;
+margin:10px;
+background-color: #ddd;
+line-height:3.0;
+}
+.rl{
+-webkit-writing-mode:vertical-rl;
+}
+.lr{
+-webkit-writing-mode:vertical-lr;
+}
+</style>
+</head>
+<body>
+<p class="rl">「向見論治道書,<span>其間欲仿井田之意</span>,而科條州郡財賦之類<br/>
+,此固為治之具。然施之當有次第。今日先務,恐當啟迪主心</p>
+
+<p class="lr">「向見論治道書,<span>其間欲仿井田之意</span>,而科條州郡財賦之類<br/>
+,此固為治之具。然施之當有次第。今日先務,恐當啟迪主心</p>
+
+</body>
+</html>
+
</ins></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (179993 => 179994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog        2015-02-12 17:20:07 UTC (rev 179993)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog        2015-02-12 17:37:26 UTC (rev 179994)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-02-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r179883. rdar://problem/19790645
+
+ 2015-02-09 David Hyatt <hyatt@apple.com>
+
+ text-underline-position: under is broken
+ https://bugs.webkit.org/show_bug.cgi?id=141400
+ <rdar://problem/18569583>
+
+ Reviewed by Simon Fraser.
+
+ Added fast/text/text-underline-position-under.html
+
+ * rendering/InlineFlowBox.cpp:
+ (WebCore::InlineFlowBox::computeMaxLogicalBottom):
+ (WebCore::InlineFlowBox::computeMaxLogicalTop): Deleted.
+ * rendering/InlineFlowBox.h:
+ Switch to using the bottom to compute the offset. Using the top is incorrect, since
+ the heights of boxes can vary.
+
+ Fix a bug where the y() of the box was being used instead of the logical value, making the result
+ wrong for vertical text.
+
+ * rendering/RootInlineBox.cpp:
+ (WebCore::RootInlineBox::maxLogicalBottom):
+ (WebCore::RootInlineBox::maxLogicalTop): Deleted.
+ Switch to using the bottom instead of the top. Make sure the root box contributes its own bottom,
+ since the old code just ignored the root's placement.
+
+ * rendering/RootInlineBox.h:
+ * style/InlineTextBoxStyle.cpp:
+ (WebCore::computeUnderlineOffset):
+ Call the bottom function now instead of the top.
+
</ins><span class="cx"> 2015-02-11 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r177377
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingInlineFlowBoxcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/InlineFlowBox.cpp (179993 => 179994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/InlineFlowBox.cpp        2015-02-12 17:20:07 UTC (rev 179993)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/InlineFlowBox.cpp        2015-02-12 17:37:26 UTC (rev 179994)
</span><span class="lines">@@ -750,7 +750,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InlineFlowBox::computeMaxLogicalTop(float& maxLogicalTop) const
</del><ins>+void InlineFlowBox::computeMaxLogicalBottom(float& maxLogicalBottom) const
</ins><span class="cx"> {
</span><span class="cx"> for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
</span><span class="cx"> if (curr->renderer().isOutOfFlowPositioned())
</span><span class="lines">@@ -759,11 +759,9 @@
</span><span class="cx"> if (descendantsHaveSameLineHeightAndBaseline())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- maxLogicalTop = std::max<float>(maxLogicalTop, curr->y());
- float localMaxLogicalTop = 0;
</del><ins>+ maxLogicalBottom = std::max<float>(maxLogicalBottom, curr->logicalBottom());
</ins><span class="cx"> if (curr->isInlineFlowBox())
</span><del>- toInlineFlowBox(curr)->computeMaxLogicalTop(localMaxLogicalTop);
- maxLogicalTop = std::max<float>(maxLogicalTop, localMaxLogicalTop);
</del><ins>+ toInlineFlowBox(curr)->computeMaxLogicalBottom(maxLogicalBottom);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingInlineFlowBoxh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/InlineFlowBox.h (179993 => 179994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/InlineFlowBox.h        2015-02-12 17:20:07 UTC (rev 179993)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/InlineFlowBox.h        2015-02-12 17:37:26 UTC (rev 179994)
</span><span class="lines">@@ -312,9 +312,9 @@
</span><span class="cx"> InlineFlowBox* m_prevLineBox; // The previous box that also uses our RenderObject
</span><span class="cx"> InlineFlowBox* m_nextLineBox; // The next box that also uses our RenderObject
</span><span class="cx">
</span><del>- // Maximum logicalTop among all children of an InlineFlowBox. Used to
</del><ins>+ // Maximum logicalBottom among all children of an InlineFlowBox. Used to
</ins><span class="cx"> // calculate the offset for TextUnderlinePositionUnder.
</span><del>- void computeMaxLogicalTop(float& maxLogicalTop) const;
</del><ins>+ void computeMaxLogicalBottom(float& maxLogicalBottom) const;
</ins><span class="cx"> private:
</span><span class="cx"> unsigned m_includeLogicalLeftEdge : 1;
</span><span class="cx"> unsigned m_includeLogicalRightEdge : 1;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRootInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RootInlineBox.cpp (179993 => 179994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RootInlineBox.cpp        2015-02-12 17:20:07 UTC (rev 179993)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RootInlineBox.cpp        2015-02-12 17:37:26 UTC (rev 179994)
</span><span class="lines">@@ -316,11 +316,11 @@
</span><span class="cx"> return heightOfBlock + maxHeight;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-float RootInlineBox::maxLogicalTop() const
</del><ins>+float RootInlineBox::maxLogicalBottom() const
</ins><span class="cx"> {
</span><del>- float maxLogicalTop = 0;
- computeMaxLogicalTop(maxLogicalTop);
- return maxLogicalTop;
</del><ins>+ float maxLogicalBottom = logicalBottom();
+ computeMaxLogicalBottom(maxLogicalBottom);
+ return maxLogicalBottom;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RootInlineBox::beforeAnnotationsAdjustment() const
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRootInlineBoxh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RootInlineBox.h (179993 => 179994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RootInlineBox.h        2015-02-12 17:20:07 UTC (rev 179993)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RootInlineBox.h        2015-02-12 17:37:26 UTC (rev 179994)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Used to calculate the underline offset for TextUnderlinePositionUnder.
</span><del>- float maxLogicalTop() const;
</del><ins>+ float maxLogicalBottom() const;
</ins><span class="cx">
</span><span class="cx"> Node* getLogicalStartBoxWithNode(InlineBox*&) const;
</span><span class="cx"> Node* getLogicalEndBoxWithNode(InlineBox*&) const;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorestyleInlineTextBoxStylecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/style/InlineTextBoxStyle.cpp (179993 => 179994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/style/InlineTextBoxStyle.cpp        2015-02-12 17:20:07 UTC (rev 179993)
+++ branches/safari-600.5-branch/Source/WebCore/style/InlineTextBoxStyle.cpp        2015-02-12 17:37:26 UTC (rev 179994)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> case TextUnderlinePositionUnder: {
</span><span class="cx"> ASSERT(inlineTextBox);
</span><span class="cx"> // Position underline relative to the bottom edge of the lowest element's content box.
</span><del>- float offset = inlineTextBox->root().maxLogicalTop() - inlineTextBox->logicalTop();
</del><ins>+ float offset = inlineTextBox->root().maxLogicalBottom() - inlineTextBox->logicalBottom();
</ins><span class="cx"> return inlineTextBox->logicalHeight() + gap + std::max<float>(offset, 0);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>