<!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>[167166] 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/167166">167166</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-04-11 15:46:02 -0700 (Fri, 11 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clear sibling floats while splitting inline flow
https://bugs.webkit.org/show_bug.cgi?id=130905
Reviewed by David Hyatt.
Source/WebCore:
This is a port of a Blink patch by kenrb@chromium.org.
(https://src.chromium.org/viewvc/blink?revision=169658&view=revision)
During RenderInline::splitFlow(), floats are cleared on an anonymous
containingBlock() for the inline being split. This is a problem if
siblings of the block contain references to the same floats, since the
float removal code in markSiblingsWithFloatsForLayout() will not later
find them.
This change also affects RenderBlock::splitFlow() and
RenderBoxModelObject::moveChildrenTo, since those are called in
similar situations as RenderInline::splitFlow().
Test: fast/block/float/split-inline-sibling-of-float-crash.html
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::removeFloatingObjects): Add call to
markSiblingsWithFloatsForLayout() before removing floats.
LayoutTests:
This test will only crash if run with Address Sanitizer or some other
address checking tool.
* fast/block/float/split-inline-sibling-of-float-crash-expected.txt: Added.
* fast/block/float/split-inline-sibling-of-float-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="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastblockfloatsplitinlinesiblingoffloatcrashexpectedtxt">trunk/LayoutTests/fast/block/float/split-inline-sibling-of-float-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastblockfloatsplitinlinesiblingoffloatcrashhtml">trunk/LayoutTests/fast/block/float/split-inline-sibling-of-float-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167165 => 167166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-11 22:38:22 UTC (rev 167165)
+++ trunk/LayoutTests/ChangeLog 2014-04-11 22:46:02 UTC (rev 167166)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-11 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ Clear sibling floats while splitting inline flow
+ https://bugs.webkit.org/show_bug.cgi?id=130905
+
+ Reviewed by David Hyatt.
+
+ This test will only crash if run with Address Sanitizer or some other
+ address checking tool.
+
+ * fast/block/float/split-inline-sibling-of-float-crash-expected.txt: Added.
+ * fast/block/float/split-inline-sibling-of-float-crash.html: Added.
+
</ins><span class="cx"> 2014-04-11 Gavin Barraclough <baraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout - Rewrite Function.bind as a builtin
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockfloatsplitinlinesiblingoffloatcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/float/split-inline-sibling-of-float-crash-expected.txt (0 => 167166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/float/split-inline-sibling-of-float-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/block/float/split-inline-sibling-of-float-crash-expected.txt 2014-04-11 22:46:02 UTC (rev 167166)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if no crash or assert under ASAN
</ins></span></pre></div>
<a id="trunkLayoutTestsfastblockfloatsplitinlinesiblingoffloatcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/float/split-inline-sibling-of-float-crash.html (0 => 167166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/float/split-inline-sibling-of-float-crash.html (rev 0)
+++ trunk/LayoutTests/fast/block/float/split-inline-sibling-of-float-crash.html 2014-04-11 22:46:02 UTC (rev 167166)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<html>
+<p style='white: fuchsia; padding: 198px 108 2147483647px; '></p>
+<myelement>
+<body>
+ <sup style="kerning: 7; display: table-row; "></sup>
+ <iframe align=right style="font-variant: small-caps;> mask: url(#tCF84); border-right-width: 20543.4114163cm; "></iframe>
+ <p id=tCF100></p>
+ <span id=tCF104>
+</body>
+<script>
+window.onload = function() {
+ keygenElem = document.createElementNS("http://www.w3.org/1999/xhtml", "keygen");
+ keygenElem.setAttribute("autofocus", "Tm");
+ document.body.appendChild(keygenElem);
+ document.body.appendChild(document.createElementNS("http://www.w3.org/1999/xhtml", "td"));
+ document.body.appendChild(document.createElementNS("http://www.w3.org/1999/xhtml", "video"));
+ setTimeout("CFcrash()", 1);
+
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+}
+function CFcrash() {
+ tCF104.appendChild(tCF100);
+ document.body.innerHTML = "PASS if no crash or assert under ASAN";
+
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.notifyDone();
+ }
+}
+</script>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167165 => 167166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-11 22:38:22 UTC (rev 167165)
+++ trunk/Source/WebCore/ChangeLog 2014-04-11 22:46:02 UTC (rev 167166)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-04-11 Bem Jones-Bey <bjonesbe@adobe.com>
+
+ Clear sibling floats while splitting inline flow
+ https://bugs.webkit.org/show_bug.cgi?id=130905
+
+ Reviewed by David Hyatt.
+
+ This is a port of a Blink patch by kenrb@chromium.org.
+ (https://src.chromium.org/viewvc/blink?revision=169658&view=revision)
+
+ During RenderInline::splitFlow(), floats are cleared on an anonymous
+ containingBlock() for the inline being split. This is a problem if
+ siblings of the block contain references to the same floats, since the
+ float removal code in markSiblingsWithFloatsForLayout() will not later
+ find them.
+
+ This change also affects RenderBlock::splitFlow() and
+ RenderBoxModelObject::moveChildrenTo, since those are called in
+ similar situations as RenderInline::splitFlow().
+
+ Test: fast/block/float/split-inline-sibling-of-float-crash.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::removeFloatingObjects): Add call to
+ markSiblingsWithFloatsForLayout() before removing floats.
+
</ins><span class="cx"> 2014-04-11 Gavin Barraclough <baraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout - Rewrite Function.bind as a builtin
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (167165 => 167166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-04-11 22:38:22 UTC (rev 167165)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-04-11 22:46:02 UTC (rev 167166)
</span><span class="lines">@@ -2061,6 +2061,8 @@
</span><span class="cx"> if (!m_floatingObjects)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ markSiblingsWithFloatsForLayout();
+
</ins><span class="cx"> m_floatingObjects->clear();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>