<!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>[215124] 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/215124">215124</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-04-07 15:48:22 -0700 (Fri, 07 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: FlowContents::segmentIndexForRunSlow skips empty runs.
https://bugs.webkit.org/show_bug.cgi?id=170552
Reviewed by Antti Koivisto.
Source/WebCore:
The compare function passed to std::lower_bound completely misses empty runs.
Test: fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html
* rendering/SimpleLineLayoutFlowContents.cpp:
(WebCore::SimpleLineLayout::FlowContents::segmentIndexForRunSlow):
LayoutTests:
* fast/text/simple-line-layout-hover-over-subsequent-linebreaks-expected.txt: Added.
* fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFlowContentscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayouthoveroversubsequentlinebreaksexpectedtxt">trunk/LayoutTests/fast/text/simple-line-layout-hover-over-subsequent-linebreaks-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayouthoveroversubsequentlinebreakshtml">trunk/LayoutTests/fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (215123 => 215124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-04-07 22:22:24 UTC (rev 215123)
+++ trunk/LayoutTests/ChangeLog 2017-04-07 22:48:22 UTC (rev 215124)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-04-07 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: FlowContents::segmentIndexForRunSlow skips empty runs.
+ https://bugs.webkit.org/show_bug.cgi?id=170552
+
+ Reviewed by Antti Koivisto.
+
+ * fast/text/simple-line-layout-hover-over-subsequent-linebreaks-expected.txt: Added.
+ * fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html: Added.
+
</ins><span class="cx"> 2017-04-07 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark media/modern-media-controls/media-controller/media-controller-auto-hide-mouse-leave-after-play.html as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayouthoveroversubsequentlinebreaksexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-hover-over-subsequent-linebreaks-expected.txt (0 => 215124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-hover-over-subsequent-linebreaks-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-hover-over-subsequent-linebreaks-expected.txt 2017-04-07 22:48:22 UTC (rev 215124)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+Pass if no crash or assert.
+foobar
+
+foobar
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayouthoveroversubsequentlinebreakshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html (0 => 215124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html 2017-04-07 22:48:22 UTC (rev 215124)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests hittest on subsequent linebreaks.</title>
+</head>
+<body>
+<div id=target>Pass if no crash or assert.<br>foobar<br><br>foobar<br><br></div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+if (window.eventSender) {
+ var x = target.offsetLeft + target.offsetWidth / 2;
+ var y = target.offsetTop + target.offsetHeight - 2;
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown();
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (215123 => 215124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-07 22:22:24 UTC (rev 215123)
+++ trunk/Source/WebCore/ChangeLog 2017-04-07 22:48:22 UTC (rev 215124)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-04-07 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: FlowContents::segmentIndexForRunSlow skips empty runs.
+ https://bugs.webkit.org/show_bug.cgi?id=170552
+
+ Reviewed by Antti Koivisto.
+
+ The compare function passed to std::lower_bound completely misses empty runs.
+
+ Test: fast/text/simple-line-layout-hover-over-subsequent-linebreaks.html
+
+ * rendering/SimpleLineLayoutFlowContents.cpp:
+ (WebCore::SimpleLineLayout::FlowContents::segmentIndexForRunSlow):
+
</ins><span class="cx"> 2017-04-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> We should log how much CPU a background process was using when killing it due to CPU limiting
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp (215123 => 215124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp 2017-04-07 22:22:24 UTC (rev 215123)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp 2017-04-07 22:48:22 UTC (rev 215124)
</span><span class="lines">@@ -68,14 +68,15 @@
</span><span class="cx">
</span><span class="cx"> unsigned FlowContents::segmentIndexForRunSlow(unsigned start, unsigned end) const
</span><span class="cx"> {
</span><del>- auto it = std::lower_bound(m_segments.begin(), m_segments.end(), start, [](const Segment& segment, unsigned start) {
- return segment.end <= start;
</del><ins>+ auto isEmptyRange = start == end;
+ auto it = std::lower_bound(m_segments.begin(), m_segments.end(), start, [isEmptyRange](const Segment& segment, unsigned start) {
+ // FIXME: This always find the first empty run (.vs subsequent <br> elements)
+ return (isEmptyRange && segment.start == segment.end) ? segment.start < start : segment.end <= start;
</ins><span class="cx"> });
</span><span class="cx"> ASSERT(it != m_segments.end());
</span><del>- ASSERT_UNUSED(end, end <= it->end);
- auto index = it - m_segments.begin();
- m_lastSegmentIndex = index;
- return index;
</del><ins>+ ASSERT(end <= it->end);
+ m_lastSegmentIndex = it - m_segments.begin();
+ return m_lastSegmentIndex;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (215123 => 215124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2017-04-07 22:22:24 UTC (rev 215123)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2017-04-07 22:48:22 UTC (rev 215124)
</span><span class="lines">@@ -155,9 +155,9 @@
</span><span class="cx"> for (auto it = range.begin(), end = range.end(); it != end; ++it) {
</span><span class="cx"> auto lineRect = *it;
</span><span class="cx"> lineRect.moveBy(accumulatedOffset);
</span><ins>+ auto& renderer = const_cast<RenderObject&>(it.renderer());
</ins><span class="cx"> if (!locationInContainer.intersects(lineRect))
</span><span class="cx"> continue;
</span><del>- auto& renderer = const_cast<RenderObject&>(it.renderer());
</del><span class="cx"> renderer.updateHitTestResult(result, locationInContainer.point() - toLayoutSize(accumulatedOffset));
</span><span class="cx"> if (!result.addNodeToRectBasedTestResult(renderer.node(), request, locationInContainer, lineRect))
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>