<!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>[205374] 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/205374">205374</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-09-02 14:50:13 -0700 (Fri, 02 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: !m_committedWidth in WebCore::LineWidth::fitBelowFloats
https://bugs.webkit.org/show_bug.cgi?id=149462
<rdar://problem/27710841>
Reviewed by David Hyatt.
Source/WebCore:
In certain cases (multiple spans on the same line with negativ marings), the LineWidth::m_committedWidth > 0
check is not sufficient to decide if some content has already been committed to the current line.
This patch adds a flag to indicate if we ever committed to the current line.
Test: fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.html
* rendering/line/BreakingContext.h:
(WebCore::BreakingContext::handleText):
* rendering/line/LineWidth.h:
(WebCore::LineWidth::hasCommitted):
LayoutTests:
* fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit-expected.txt: Added.
* fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.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="#trunkSourceWebCorerenderinglineBreakingContexth">trunk/Source/WebCore/rendering/line/BreakingContext.h</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineWidthcpp">trunk/Source/WebCore/rendering/line/LineWidth.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineWidthh">trunk/Source/WebCore/rendering/line/LineWidth.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextassertwhentextwithnegativemarginsiblingdoesnotfitexpectedtxt">trunk/LayoutTests/fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextassertwhentextwithnegativemarginsiblingdoesnotfithtml">trunk/LayoutTests/fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205373 => 205374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-02 21:43:45 UTC (rev 205373)
+++ trunk/LayoutTests/ChangeLog 2016-09-02 21:50:13 UTC (rev 205374)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-02 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: !m_committedWidth in WebCore::LineWidth::fitBelowFloats
+ https://bugs.webkit.org/show_bug.cgi?id=149462
+ <rdar://problem/27710841>
+
+ Reviewed by David Hyatt.
+
+ * fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit-expected.txt: Added.
+ * fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.html: Added.
+
</ins><span class="cx"> 2016-09-02 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Distinguish between paint advances and base advances
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextassertwhentextwithnegativemarginsiblingdoesnotfitexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit-expected.txt (0 => 205374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit-expected.txt 2016-09-02 21:50:13 UTC (rev 205374)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no assert in debug.
+foobarfo b
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextassertwhentextwithnegativemarginsiblingdoesnotfithtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.html (0 => 205374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.html (rev 0)
+++ trunk/LayoutTests/fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.html 2016-09-02 21:50:13 UTC (rev 205374)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that inline does not assert when its composite state changes.</title>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+div {
+ max-width: 1px;
+}
+
+.title {
+ margin-right: -60px;
+}
+</style>
+</head>
+<body>
+PASS if no assert in debug.
+<div><span><span class="title">foobar</span><span>fo b</span></span></div>
+</body>
+<html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205373 => 205374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-02 21:43:45 UTC (rev 205373)
+++ trunk/Source/WebCore/ChangeLog 2016-09-02 21:50:13 UTC (rev 205374)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-09-02 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: !m_committedWidth in WebCore::LineWidth::fitBelowFloats
+ https://bugs.webkit.org/show_bug.cgi?id=149462
+ <rdar://problem/27710841>
+
+ Reviewed by David Hyatt.
+
+ In certain cases (multiple spans on the same line with negativ marings), the LineWidth::m_committedWidth > 0
+ check is not sufficient to decide if some content has already been committed to the current line.
+ This patch adds a flag to indicate if we ever committed to the current line.
+
+ Test: fast/text/assert-when-text-with-negative-margin-sibling-does-not-fit.html
+
+ * rendering/line/BreakingContext.h:
+ (WebCore::BreakingContext::handleText):
+ * rendering/line/LineWidth.h:
+ (WebCore::LineWidth::hasCommitted):
+
</ins><span class="cx"> 2016-09-02 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Distinguish between paint advances and base advances
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContext.h (205373 => 205374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContext.h 2016-09-02 21:43:45 UTC (rev 205373)
+++ trunk/Source/WebCore/rendering/line/BreakingContext.h 2016-09-02 21:50:13 UTC (rev 205374)
</span><span class="lines">@@ -581,9 +581,9 @@
</span><span class="cx"> m_ignoringSpaces = true;
</span><span class="cx"> }
</span><span class="cx"> if (downcast<RenderListMarker>(*m_current.renderer()).isInside())
</span><del>- m_width.addUncommittedReplacedWidth(replacedLogicalWidth);
</del><ins>+ m_width.addUncommittedWidth(replacedLogicalWidth);
</ins><span class="cx"> } else
</span><del>- m_width.addUncommittedReplacedWidth(replacedLogicalWidth);
</del><ins>+ m_width.addUncommittedWidth(replacedLogicalWidth);
</ins><span class="cx"> if (is<RenderRubyRun>(*m_current.renderer())) {
</span><span class="cx"> m_width.applyOverhang(downcast<RenderRubyRun>(m_current.renderer()), m_lastObject, m_nextObject);
</span><span class="cx"> downcast<RenderRubyRun>(m_current.renderer())->updatePriorContextFromCachedBreakIterator(m_renderTextInfo.lineBreakIterator);
</span><span class="lines">@@ -800,7 +800,7 @@
</span><span class="cx"> float charWidth = 0;
</span><span class="cx"> bool breakNBSP = m_autoWrap && m_currentStyle->nbspMode() == SPACE;
</span><span class="cx"> // Auto-wrapping text should wrap in the middle of a word only if it could not wrap before the word,
</span><del>- // which is only possible if the word is the first thing on the line, that is, if |w| is zero.
</del><ins>+ // which is only possible if the word is the first thing on the line.
</ins><span class="cx"> bool breakWords = m_currentStyle->breakWords() && ((m_autoWrap && !m_width.hasCommitted()) || m_currWS == PRE);
</span><span class="cx"> bool midWordBreak = false;
</span><span class="cx"> bool breakAll = m_currentStyle->wordBreak() == BreakAllWordBreak && m_autoWrap;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.cpp (205373 => 205374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.cpp 2016-09-02 21:43:45 UTC (rev 205373)
+++ trunk/Source/WebCore/rendering/line/LineWidth.cpp 2016-09-02 21:50:13 UTC (rev 205374)
</span><span class="lines">@@ -37,14 +37,6 @@
</span><span class="cx">
</span><span class="cx"> LineWidth::LineWidth(RenderBlockFlow& block, bool isFirstLine, IndentTextOrNot shouldIndentText)
</span><span class="cx"> : m_block(block)
</span><del>- , m_uncommittedWidth(0)
- , m_committedWidth(0)
- , m_overhangWidth(0)
- , m_trailingWhitespaceWidth(0)
- , m_trailingCollapsedWhitespaceWidth(0)
- , m_left(0)
- , m_right(0)
- , m_availableWidth(0)
</del><span class="cx"> , m_isFirstLine(isFirstLine)
</span><span class="cx"> , m_shouldIndentText(shouldIndentText)
</span><span class="cx"> {
</span><span class="lines">@@ -136,10 +128,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_committedWidth += m_uncommittedWidth;
</span><span class="cx"> m_uncommittedWidth = 0;
</span><del>- if (m_hasUncommittedReplaced) {
- m_hasCommittedReplaced = true;
- m_hasUncommittedReplaced = false;
- }
</del><ins>+ m_hasCommitted = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LineWidth::applyOverhang(RenderRubyRun* rubyRun, RenderObject* startRenderer, RenderObject* endRenderer)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.h (205373 => 205374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.h 2016-09-02 21:43:45 UTC (rev 205373)
+++ trunk/Source/WebCore/rendering/line/LineWidth.h 2016-09-02 21:50:13 UTC (rev 205374)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> float availableWidth() const { return m_availableWidth; }
</span><span class="cx"> float logicalLeftOffset() const { return m_left; }
</span><span class="cx">
</span><del>- bool hasCommitted() const { return m_committedWidth > 0 || m_hasCommittedReplaced; }
</del><ins>+ bool hasCommitted() const { return m_hasCommitted; }
</ins><span class="cx">
</span><span class="cx"> void updateAvailableWidth(LayoutUnit minimumHeight = 0);
</span><span class="cx"> void shrinkAvailableWidthForNewFloatIfNeeded(const FloatingObject&);
</span><span class="lines">@@ -67,11 +67,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_uncommittedWidth += delta;
</span><span class="cx"> }
</span><del>- void addUncommittedReplacedWidth(float delta)
- {
- addUncommittedWidth(delta);
- m_hasUncommittedReplaced = true;
- }
</del><span class="cx"> void commit();
</span><span class="cx"> void applyOverhang(RenderRubyRun*, RenderObject* startRenderer, RenderObject* endRenderer);
</span><span class="cx"> void fitBelowFloats(bool isFirstLine = false);
</span><span class="lines">@@ -89,17 +84,16 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RenderBlockFlow& m_block;
</span><del>- float m_uncommittedWidth;
- float m_committedWidth;
- float m_overhangWidth; // The amount by which |m_availableWidth| has been inflated to account for possible contraction due to ruby overhang.
- float m_trailingWhitespaceWidth;
- float m_trailingCollapsedWhitespaceWidth;
- float m_left;
- float m_right;
- float m_availableWidth;
- bool m_isFirstLine;
- bool m_hasUncommittedReplaced { false };
- bool m_hasCommittedReplaced { false };
</del><ins>+ float m_uncommittedWidth { 0 };
+ float m_committedWidth { 0 };
+ float m_overhangWidth { 0 }; // The amount by which |m_availableWidth| has been inflated to account for possible contraction due to ruby overhang.
+ float m_trailingWhitespaceWidth { 0 };
+ float m_trailingCollapsedWhitespaceWidth { 0 };
+ float m_left { 0 };
+ float m_right { 0 };
+ float m_availableWidth { 0 };
+ bool m_isFirstLine { true };
+ bool m_hasCommitted { false };
</ins><span class="cx"> IndentTextOrNot m_shouldIndentText;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>