<!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>[168012] branches/safari-537.76-branch</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/168012">168012</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-04-30 06:59:44 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge 166428. <rdar://problem/16701982></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53776branchLayoutTestsChangeLog">branches/safari-537.76-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWebCoreChangeLog">branches/safari-537.76-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWebCorerenderingRenderBlockLineLayoutcpp">branches/safari-537.76-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53776branchLayoutTestsfastblockfloatfloatsincleanlinecrashexpectedtxt">branches/safari-537.76-branch/LayoutTests/fast/block/float/floats-in-clean-line-crash-expected.txt</a></li>
<li><a href="#branchessafari53776branchLayoutTestsfastblockfloatfloatsincleanlinecrashhtml">branches/safari-537.76-branch/LayoutTests/fast/block/float/floats-in-clean-line-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53776branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/LayoutTests/ChangeLog (168011 => 168012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-04-30 13:51:47 UTC (rev 168011)
+++ branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-04-30 13:59:44 UTC (rev 168012)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-04-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r166428
+
+ 2014-03-28 Radu Stavila <stavila@adobe.com>
+
+ In some situations, partial layouts of floating elements produce incorrect results.
+ https://bugs.webkit.org/show_bug.cgi?id=122668
+
+ Reviewed by David Hyatt.
+
+ Added test to ensure an assertion is not reached when performing a partial
+ layout of float elements in certain situations.
+
+ * fast/block/float/floats-in-clean-line-crash-expected.txt: Added.
+ * fast/block/float/floats-in-clean-line-crash.html: Added.
+
+2014-04-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r166236
</span><span class="cx">
</span><span class="cx"> 2014-03-25 David Kilzer <ddkilzer@apple.com>
</span></span></pre></div>
<a id="branchessafari53776branchLayoutTestsfastblockfloatfloatsincleanlinecrashexpectedtxtfromrev166428trunkLayoutTestsfastblockfloatfloatsincleanlinecrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.76-branch/LayoutTests/fast/block/float/floats-in-clean-line-crash-expected.txt (from rev 166428, trunk/LayoutTests/fast/block/float/floats-in-clean-line-crash-expected.txt) (0 => 168012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/fast/block/float/floats-in-clean-line-crash-expected.txt (rev 0)
+++ branches/safari-537.76-branch/LayoutTests/fast/block/float/floats-in-clean-line-crash-expected.txt 2014-04-30 13:59:44 UTC (rev 168012)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Bug 122668 - The test passes if it doesn't crash
+1
+A2
+
</ins></span></pre></div>
<a id="branchessafari53776branchLayoutTestsfastblockfloatfloatsincleanlinecrashhtmlfromrev166428trunkLayoutTestsfastblockfloatfloatsincleanlinecrashhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.76-branch/LayoutTests/fast/block/float/floats-in-clean-line-crash.html (from rev 166428, trunk/LayoutTests/fast/block/float/floats-in-clean-line-crash.html) (0 => 168012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/fast/block/float/floats-in-clean-line-crash.html (rev 0)
+++ branches/safari-537.76-branch/LayoutTests/fast/block/float/floats-in-clean-line-crash.html 2014-04-30 13:59:44 UTC (rev 168012)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<html>
+ <style>
+ html {
+ height:100%;
+ }
+
+ .test {
+ float:left;
+ }
+ </style>
+
+ <body>
+ <a href="https://bugs.webkit.org/show_bug.cgi?id=122668">Bug 122668 - The test passes if it doesn't crash</a>
+ <br id="br">
+ <div class="test">1</div>
+ <div>A<div class="test">2</div><span id="span"></span></div>
+ </body>
+
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ var br = document.getElementById("br");
+ elem = document.getElementById("span");
+ document.body.parentNode.insertBefore(elem, document.body.nextSibling);
+ try
+ {
+ document.getElementById("br").lookupNamespacePrefix("text", document.getElementById("br"));
+ }
+ catch(e)
+ {
+ }
+
+ var canvas = document.createElement("canvas");
+ canvas.setAttribute("height", "1226");
+ canvas.setAttribute("width", "3391");
+ br.parentNode.insertBefore(canvas, br.nextSibling);
+ var ctx = canvas.getContext("2d");
+ ctx.strokeRect(br.appendChild(document.createElement("olist")).offsetLeft, 65535, 11111111111111111111111111111111, 9223372036);
+ head = document.getElementsByTagName("head")[0];
+ var style = document.createElement("style");
+ style.innerHTML=":first-of-type { \n\
+ position: fixed;\n\
+ } \n\
+ ";
+ head.appendChild(style);
+ </script>
+</html>
</ins></span></pre></div>
<a id="branchessafari53776branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/ChangeLog (168011 => 168012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-04-30 13:51:47 UTC (rev 168011)
+++ branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-04-30 13:59:44 UTC (rev 168012)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-04-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r166428
+
+ 2014-03-28 Radu Stavila <stavila@adobe.com>
+
+ In some situations, partial layouts of floating elements produce incorrect results.
+ https://bugs.webkit.org/show_bug.cgi?id=122668
+
+ Reviewed by David Hyatt.
+
+ When performing partial layout of float elements and checking if other float
+ elements are encountered, incorrect results were obtained by not checking
+ the size of the existing floats vector.
+
+ Test: fast/block/float/floats-in-clean-line-crash.html
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::checkFloatsInCleanLine):
+
+2014-04-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r166236
</span><span class="cx">
</span><span class="cx"> 2014-03-25 David Kilzer <ddkilzer@apple.com>
</span></span></pre></div>
<a id="branchessafari53776branchSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp (168011 => 168012)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-04-30 13:51:47 UTC (rev 168011)
+++ branches/safari-537.76-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-04-30 13:59:44 UTC (rev 168012)
</span><span class="lines">@@ -2206,6 +2206,11 @@
</span><span class="cx"> Vector<RenderBox*>* cleanLineFloats = line->floatsPtr();
</span><span class="cx"> if (!cleanLineFloats)
</span><span class="cx"> return;
</span><ins>+
+ if (!floats.size()) {
+ encounteredNewFloat = true;
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> Vector<RenderBox*>::iterator end = cleanLineFloats->end();
</span><span class="cx"> for (Vector<RenderBox*>::iterator it = cleanLineFloats->begin(); it != end; ++it) {
</span></span></pre>
</div>
</div>
</body>
</html>