<!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>[212912] 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/212912">212912</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-02-23 12:12:23 -0800 (Thu, 23 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Adjust RunResolver::lineIndexForHeight with line struts.
https://bugs.webkit.org/show_bug.cgi?id=168783
<rdar://problem/30676449>
Reviewed by Antti Koivisto.
When there's a pagination gap between lines the simple lineIndex = y / lineHeight formula does not work anymore.
This patch takes the line gaps into account by offsetting the y position accordingly.
Not enabled yet.
* rendering/SimpleLineLayoutResolver.cpp:
(WebCore::SimpleLineLayout::RunResolver::lineIndexForHeight):</pre>
<h3>Modified Paths</h3>
<ul>
<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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212911 => 212912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-23 19:56:56 UTC (rev 212911)
+++ trunk/Source/WebCore/ChangeLog 2017-02-23 20:12:23 UTC (rev 212912)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-02-23 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Adjust RunResolver::lineIndexForHeight with line struts.
+ https://bugs.webkit.org/show_bug.cgi?id=168783
+ <rdar://problem/30676449>
+
+ Reviewed by Antti Koivisto.
+
+ When there's a pagination gap between lines the simple lineIndex = y / lineHeight formula does not work anymore.
+ This patch takes the line gaps into account by offsetting the y position accordingly.
+
+ Not enabled yet.
+
+ * rendering/SimpleLineLayoutResolver.cpp:
+ (WebCore::SimpleLineLayout::RunResolver::lineIndexForHeight):
+
</ins><span class="cx"> 2017-02-23 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix iOS WebRTC build after r212812
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp (212911 => 212912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp 2017-02-23 19:56:56 UTC (rev 212911)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp 2017-02-23 20:12:23 UTC (rev 212912)
</span><span class="lines">@@ -132,6 +132,26 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+unsigned RunResolver::adjustLineIndexForStruts(LayoutUnit y, unsigned lineIndexCandidate) const
+{
+ auto& struts = m_layout.struts();
+ // We need to offset the lineIndex with line struts when there's an actual strut before the candidate.
+ auto& strut = struts.first();
+ if (strut.lineBreak >= lineIndexCandidate)
+ return lineIndexCandidate;
+ // 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;
+ for (auto lineIndex = strut.lineBreak; lineIndex < m_layout.lineCount(); ++lineIndex) {
+ if (strutIndex < struts.size() && struts.at(strutIndex).lineBreak == lineIndex)
+ topPosition += struts.at(strutIndex++).offset;
+ if (y >= topPosition && y < (topPosition + m_lineHeight))
+ return lineIndex;
+ topPosition += m_lineHeight;
+ }
+ return m_layout.lineCount() - 1;
+}
+
</ins><span class="cx"> unsigned RunResolver::lineIndexForHeight(LayoutUnit height, IndexType type) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_lineHeight);
</span><span class="lines">@@ -142,7 +162,10 @@
</span><span class="cx"> else
</span><span class="cx"> y -= m_baseline - m_ascent;
</span><span class="cx"> y = std::max<float>(y, 0);
</span><del>- return std::min<unsigned>(y / m_lineHeight, m_layout.lineCount() - 1);
</del><ins>+ auto lineIndexCandidate = std::min<unsigned>(y / m_lineHeight, m_layout.lineCount() - 1);
+ if (m_layout.hasLineStruts())
+ return adjustLineIndexForStruts(y, lineIndexCandidate);
+ return lineIndexCandidate;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WTF::IteratorRange<RunResolver::Iterator> RunResolver::rangeForRect(const LayoutRect& rect) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h (212911 => 212912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2017-02-23 19:56:56 UTC (rev 212911)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2017-02-23 20:12:23 UTC (rev 212912)
</span><span class="lines">@@ -109,6 +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><ins>+ unsigned adjustLineIndexForStruts(LayoutUnit, 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>