<!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>[213779] trunk</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/213779">213779</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-03-12 20:16:43 -0700 (Sun, 12 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Paginated content is not painted properly when font overflows line height.
https://bugs.webkit.org/show_bug.cgi?id=169516
Reviewed by Antti Koivisto.
Source/WebCore:
adjustLineIndexForStruts should take the IndexType::First/Last into account
when searching for the line index in a paginated context.
This also changes the the computed offset height from m_lineHeight to m_ascent + m_descent
so that we can find lines with large fonts (but small line height).
Test: fast/multicol/simple-line-layout-line-index-after-strut.html
* rendering/SimpleLineLayoutResolver.cpp:
(WebCore::SimpleLineLayout::RunResolver::adjustLineIndexForStruts):
(WebCore::SimpleLineLayout::RunResolver::lineIndexForHeight):
(WebCore::SimpleLineLayout::RunResolver::rangeForRect):
* rendering/SimpleLineLayoutResolver.h:
LayoutTests:
* fast/multicol/simple-line-layout-line-index-after-strut-expected.html: Added.
* fast/multicol/simple-line-layout-line-index-after-strut.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutResolvercpp">trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutResolverh">trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolsimplelinelayoutlineindexafterstrutexpectedhtml">trunk/LayoutTests/fast/multicol/simple-line-layout-line-index-after-strut-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolsimplelinelayoutlineindexafterstruthtml">trunk/LayoutTests/fast/multicol/simple-line-layout-line-index-after-strut.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213778 => 213779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-13 01:54:16 UTC (rev 213778)
+++ trunk/LayoutTests/ChangeLog 2017-03-13 03:16:43 UTC (rev 213779)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-12 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Paginated content is not painted properly when font overflows line height.
+ https://bugs.webkit.org/show_bug.cgi?id=169516
+
+ Reviewed by Antti Koivisto.
+
+ * fast/multicol/simple-line-layout-line-index-after-strut-expected.html: Added.
+ * fast/multicol/simple-line-layout-line-index-after-strut.html: Added.
+
</ins><span class="cx"> 2017-03-12 Javier Fernandez <jfernandez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unreviewed test gardening
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolsimplelinelayoutlineindexafterstrutexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/simple-line-layout-line-index-after-strut-expected.html (0 => 213779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/simple-line-layout-line-index-after-strut-expected.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/simple-line-layout-line-index-after-strut-expected.html 2017-03-13 03:16:43 UTC (rev 213779)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that paginated lines are painting properly when lines visually overflow.</title>
+<style>
+html {
+ overflow: hidden;
+}
+div {
+ font-size: 241px;
+ line-height: 0.7;
+ padding-top: 47px;
+}
+</style>
+</head>
+<body>
+<div>
+foobar
+foobar
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolsimplelinelayoutlineindexafterstruthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/simple-line-layout-line-index-after-strut.html (0 => 213779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/simple-line-layout-line-index-after-strut.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/simple-line-layout-line-index-after-strut.html 2017-03-13 03:16:43 UTC (rev 213779)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that paginated lines are painting properly when lines visually overflow.</title>
+<style>
+html {
+ overflow: hidden;
+}
+div {
+ column-fill: auto;
+ font-size: 241px;
+ line-height: 0.7;
+}
+</style>
+</head>
+<body>
+<div>
+foobar
+foobar
+foobar
+foobar
+foobar
+foobar
+foobar
+foobar
+foobar
+foobar
+foobar
+foobar
+foobar
+foobar
+foobar
+foobar
+</div>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ internals.setPagination("LeftToRightPaginated", 0);
+}
+
+setTimeout(function() {
+ window.scrollTo(1600, 0);
+ document.body.offsetHeight;
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (213778 => 213779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-03-13 01:54:16 UTC (rev 213778)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-03-13 03:16:43 UTC (rev 213779)
</span><span class="lines">@@ -1531,6 +1531,7 @@
</span><span class="cx"> fast/multicol/span/generated-child-split-flow-crash.html [ Failure ]
</span><span class="cx"> fast/multicol/split-in-top-margin.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/multicol/vertical-rl/rule-style.html [ Failure ]
</span><ins>+fast/multicol/simple-line-layout-line-index-after-strut.html [ ImageOnlyFailure ]
</ins><span class="cx"> fast/overflow/horizontal-scroll-after-back.html [ Failure ]
</span><span class="cx"> fast/overflow/overflow-y-scroll.html [ Failure ]
</span><span class="cx"> fast/overflow/scroll-div-hide-show.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213778 => 213779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-13 01:54:16 UTC (rev 213778)
+++ trunk/Source/WebCore/ChangeLog 2017-03-13 03:16:43 UTC (rev 213779)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-03-12 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Paginated content is not painted properly when font overflows line height.
+ https://bugs.webkit.org/show_bug.cgi?id=169516
+
+ Reviewed by Antti Koivisto.
+
+ adjustLineIndexForStruts should take the IndexType::First/Last into account
+ when searching for the line index in a paginated context.
+ This also changes the the computed offset height from m_lineHeight to m_ascent + m_descent
+ so that we can find lines with large fonts (but small line height).
+
+ Test: fast/multicol/simple-line-layout-line-index-after-strut.html
+
+ * rendering/SimpleLineLayoutResolver.cpp:
+ (WebCore::SimpleLineLayout::RunResolver::adjustLineIndexForStruts):
+ (WebCore::SimpleLineLayout::RunResolver::lineIndexForHeight):
+ (WebCore::SimpleLineLayout::RunResolver::rangeForRect):
+ * rendering/SimpleLineLayoutResolver.h:
+
</ins><span class="cx"> 2017-03-12 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add full NSHTTPCookie fidelity to WebCore::Cookie.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp (213778 => 213779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp 2017-03-13 01:54:16 UTC (rev 213778)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp 2017-03-13 03:16:43 UTC (rev 213779)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned RunResolver::adjustLineIndexForStruts(LayoutUnit y, unsigned lineIndexCandidate) const
</del><ins>+unsigned RunResolver::adjustLineIndexForStruts(LayoutUnit y, IndexType type, unsigned lineIndexCandidate) const
</ins><span class="cx"> {
</span><span class="cx"> auto& struts = m_layout.struts();
</span><span class="cx"> // We need to offset the lineIndex with line struts when there's an actual strut before the candidate.
</span><span class="lines">@@ -139,15 +139,20 @@
</span><span class="cx"> auto& strut = struts.first();
</span><span class="cx"> if (strut.lineBreak >= lineIndexCandidate)
</span><span class="cx"> return lineIndexCandidate;
</span><del>- // Jump over the first strut since we know that the line we are looking for is beyond the strut.
- unsigned strutIndex = 1;
- float topPosition = strut.lineBreak * m_lineHeight + strut.offset;
</del><ins>+ unsigned strutIndex = 0;
+ std::optional<unsigned> lastIndexCandidate;
+ float topPosition = strut.lineBreak * m_lineHeight + (m_baseline - m_ascent);
</ins><span class="cx"> for (auto lineIndex = strut.lineBreak; lineIndex < m_layout.lineCount(); ++lineIndex) {
</span><ins>+ float strutOffset = 0;
</ins><span class="cx"> if (strutIndex < struts.size() && struts.at(strutIndex).lineBreak == lineIndex)
</span><del>- topPosition += struts.at(strutIndex++).offset;
- if (y >= topPosition && y < (topPosition + m_lineHeight))
- return lineIndex;
- topPosition += m_lineHeight;
</del><ins>+ strutOffset = struts.at(strutIndex++).offset;
+ if (y >= topPosition && y < (topPosition + m_ascent + m_descent + strutOffset)) {
+ if (type == IndexType::First)
+ return lineIndex;
+ lastIndexCandidate = lineIndex;
+ } else if (lastIndexCandidate)
+ return *lastIndexCandidate;
+ topPosition += m_lineHeight + strutOffset;
</ins><span class="cx"> }
</span><span class="cx"> return m_layout.lineCount() - 1;
</span><span class="cx"> }
</span><span class="lines">@@ -157,14 +162,15 @@
</span><span class="cx"> ASSERT(m_lineHeight);
</span><span class="cx"> float y = height - m_borderAndPaddingBefore;
</span><span class="cx"> // Lines may overlap, adjust to get the first or last line at this height.
</span><ins>+ auto adjustedY = y;
</ins><span class="cx"> if (type == IndexType::First)
</span><del>- y += m_lineHeight - (m_baseline + m_descent);
</del><ins>+ adjustedY += m_lineHeight - (m_baseline + m_descent);
</ins><span class="cx"> else
</span><del>- y -= m_baseline - m_ascent;
- y = std::max<float>(y, 0);
- auto lineIndexCandidate = std::min<unsigned>(y / m_lineHeight, m_layout.lineCount() - 1);
</del><ins>+ adjustedY -= m_baseline - m_ascent;
+ adjustedY = std::max<float>(adjustedY, 0);
+ auto lineIndexCandidate = std::min<unsigned>(adjustedY / m_lineHeight, m_layout.lineCount() - 1);
</ins><span class="cx"> if (m_layout.hasLineStruts())
</span><del>- return adjustLineIndexForStruts(y, lineIndexCandidate);
</del><ins>+ return adjustLineIndexForStruts(y, type, lineIndexCandidate);
</ins><span class="cx"> return lineIndexCandidate;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -175,7 +181,6 @@
</span><span class="cx">
</span><span class="cx"> unsigned firstLine = lineIndexForHeight(rect.y(), IndexType::First);
</span><span class="cx"> unsigned lastLine = std::max(firstLine, lineIndexForHeight(rect.maxY(), IndexType::Last));
</span><del>-
</del><span class="cx"> auto rangeBegin = begin().advanceLines(firstLine);
</span><span class="cx"> if (rangeBegin == end())
</span><span class="cx"> return { end(), end() };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h (213778 => 213779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2017-03-13 01:54:16 UTC (rev 213778)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2017-03-13 03:16:43 UTC (rev 213779)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> private:
</span><span class="cx"> enum class IndexType { First, Last };
</span><span class="cx"> unsigned lineIndexForHeight(LayoutUnit, IndexType) const;
</span><del>- unsigned adjustLineIndexForStruts(LayoutUnit, unsigned lineIndexCandidate) const;
</del><ins>+ unsigned adjustLineIndexForStruts(LayoutUnit, IndexType, unsigned lineIndexCandidate) const;
</ins><span class="cx">
</span><span class="cx"> const RenderBlockFlow& m_flowRenderer;
</span><span class="cx"> const Layout& m_layout;
</span></span></pre>
</div>
</div>
</body>
</html>