<!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>[211647] 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/211647">211647</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-02-03 13:17:28 -0800 (Fri, 03 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Removing adjacent trailing whitespace runs should not crash.
https://bugs.webkit.org/show_bug.cgi?id=167803
<rdar://problem/30337368>
Reviewed by Antti Koivisto.
Source/WebCore:
In case of adjacent collapsed whitespace fragments, the length of these fragments (TextFragmentIterator::TextFragment)
do not necessarily equal the length of the final runs (SimpleLineLayout::Run).
This patch removes the dependency on the length and switches over to using the position information instead.
Test: fast/text/simple-line-layout-multiple-trailingwhitespace-crash.html
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::LineState::appendFragmentAndCreateRunIfNeeded):
(WebCore::SimpleLineLayout::LineState::removeTrailingWhitespace):
LayoutTests:
* fast/text/simple-line-layout-multiple-trailingwhitespace-crash-expected.txt: Added.
* fast/text/simple-line-layout-multiple-trailingwhitespace-crash.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="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutmultipletrailingwhitespacecrashexpectedtxt">trunk/LayoutTests/fast/text/simple-line-layout-multiple-trailingwhitespace-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextsimplelinelayoutmultipletrailingwhitespacecrashhtml">trunk/LayoutTests/fast/text/simple-line-layout-multiple-trailingwhitespace-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211646 => 211647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-03 20:53:35 UTC (rev 211646)
+++ trunk/LayoutTests/ChangeLog 2017-02-03 21:17:28 UTC (rev 211647)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-03 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Removing adjacent trailing whitespace runs should not crash.
+ https://bugs.webkit.org/show_bug.cgi?id=167803
+ <rdar://problem/30337368>
+
+ Reviewed by Antti Koivisto.
+
+ * fast/text/simple-line-layout-multiple-trailingwhitespace-crash-expected.txt: Added.
+ * fast/text/simple-line-layout-multiple-trailingwhitespace-crash.html: Added.
+
</ins><span class="cx"> 2017-02-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix bad assertion under HTMLTreeBuilder::processStartTagForInBody()
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutmultipletrailingwhitespacecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-multiple-trailingwhitespace-crash-expected.txt (0 => 211647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-multiple-trailingwhitespace-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-multiple-trailingwhitespace-crash-expected.txt 2017-02-03 21:17:28 UTC (rev 211647)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no crash or assert.
+F
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextsimplelinelayoutmultipletrailingwhitespacecrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/simple-line-layout-multiple-trailingwhitespace-crash.html (0 => 211647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/simple-line-layout-multiple-trailingwhitespace-crash.html (rev 0)
+++ trunk/LayoutTests/fast/text/simple-line-layout-multiple-trailingwhitespace-crash.html 2017-02-03 21:17:28 UTC (rev 211647)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>This tests that we don't crash on multiple trailing whitespace runs</title>
+<style>
+div {
+ font-size: 0;
+}
+</style>
+</head>
+<body>
+PASS if no crash or assert.
+<div>F <!---->
+</div>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211646 => 211647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-03 20:53:35 UTC (rev 211646)
+++ trunk/Source/WebCore/ChangeLog 2017-02-03 21:17:28 UTC (rev 211647)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-02-03 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Removing adjacent trailing whitespace runs should not crash.
+ https://bugs.webkit.org/show_bug.cgi?id=167803
+ <rdar://problem/30337368>
+
+ Reviewed by Antti Koivisto.
+
+ In case of adjacent collapsed whitespace fragments, the length of these fragments (TextFragmentIterator::TextFragment)
+ do not necessarily equal the length of the final runs (SimpleLineLayout::Run).
+ This patch removes the dependency on the length and switches over to using the position information instead.
+
+ Test: fast/text/simple-line-layout-multiple-trailingwhitespace-crash.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::LineState::appendFragmentAndCreateRunIfNeeded):
+ (WebCore::SimpleLineLayout::LineState::removeTrailingWhitespace):
+
</ins><span class="cx"> 2017-02-03 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Correct memory leak in MediaConstraints
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (211646 => 211647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-02-03 20:53:35 UTC (rev 211646)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-02-03 21:17:28 UTC (rev 211647)
</span><span class="lines">@@ -383,20 +383,23 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void revertRuns(Layout::RunVector& runs, unsigned length, float width)
</del><ins>+static void revertRuns(Layout::RunVector& runs, unsigned positionToRevertTo, float width)
</ins><span class="cx"> {
</span><del>- while (length) {
- ASSERT(runs.size());
- Run& lastRun = runs.last();
- unsigned lastRunLength = lastRun.end - lastRun.start;
- if (lastRunLength > length) {
</del><ins>+ while (runs.size()) {
+ auto& lastRun = runs.last();
+ if (lastRun.end <= positionToRevertTo)
+ break;
+ if (lastRun.start >= positionToRevertTo) {
+ // Revert this run completely.
+ width -= (lastRun.logicalRight - lastRun.logicalLeft);
+ runs.removeLast();
+ } else {
</ins><span class="cx"> lastRun.logicalRight -= width;
</span><del>- lastRun.end -= length;
</del><ins>+ width = 0;
+ lastRun.end = positionToRevertTo;
+ // Partial removal.
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><del>- length -= lastRunLength;
- width -= (lastRun.logicalRight - lastRun.logicalLeft);
- runs.removeLast();
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -517,7 +520,7 @@
</span><span class="cx"> }
</span><span class="cx"> ASSERT(m_lastFragment.isValid());
</span><span class="cx"> m_runsWidth -= m_uncompletedWidth;
</span><del>- revertRuns(runs, endPositionForCollapsedFragment(m_lastFragment) - endPositionForCollapsedFragment(m_lastCompleteFragment), m_uncompletedWidth);
</del><ins>+ revertRuns(runs, endPositionForCollapsedFragment(m_lastCompleteFragment), m_uncompletedWidth);
</ins><span class="cx"> m_uncompletedWidth = 0;
</span><span class="cx"> ASSERT(m_lastCompleteFragment.isValid());
</span><span class="cx"> return m_lastCompleteFragment;
</span><span class="lines">@@ -527,8 +530,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_lastFragment.type() != TextFragmentIterator::TextFragment::Whitespace || m_lastFragment.end() == m_lastNonWhitespaceFragment.end())
</span><span class="cx"> return;
</span><del>- unsigned trailingWhitespaceLength = endPositionForCollapsedFragment(m_lastFragment) - m_lastNonWhitespaceFragment.end();
- revertRuns(runs, trailingWhitespaceLength, m_trailingWhitespaceWidth);
</del><ins>+ revertRuns(runs, m_lastNonWhitespaceFragment.end(), m_trailingWhitespaceWidth);
</ins><span class="cx"> m_runsWidth -= m_trailingWhitespaceWidth;
</span><span class="cx"> m_lastFragment = m_lastNonWhitespaceFragment;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>