<!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>[167580] 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/167580">167580</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-04-20 21:40:11 -0700 (Sun, 20 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple layout can get confused by coordinate overflow
https://bugs.webkit.org/show_bug.cgi?id=131890
rdar://problem/15558510
Reviewed by Andreas Kling.
Source/WebCore:
Test: fast/css/simple-layout-overflow.html
* rendering/SimpleLineLayoutResolver.h:
(WebCore::SimpleLineLayout::RunResolver::rangeForRect):
If lastLine is smaller than firstList, just ignore it.
LayoutTests:
* fast/css/simple-layout-overflow-expected.txt: Added.
* fast/css/simple-layout-overflow.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="#trunkSourceWebCorerenderingSimpleLineLayoutResolverh">trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcsssimplelayoutoverflowexpectedtxt">trunk/LayoutTests/fast/css/simple-layout-overflow-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsssimplelayoutoverflowhtml">trunk/LayoutTests/fast/css/simple-layout-overflow.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167579 => 167580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-21 04:39:11 UTC (rev 167579)
+++ trunk/LayoutTests/ChangeLog 2014-04-21 04:40:11 UTC (rev 167580)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-04-19 Darin Adler <darin@apple.com>
+
+ Simple layout can get confused by coordinate overflow
+ https://bugs.webkit.org/show_bug.cgi?id=131890
+ rdar://problem/15558510
+
+ Reviewed by Andreas Kling.
+
+ * fast/css/simple-layout-overflow-expected.txt: Added.
+ * fast/css/simple-layout-overflow.html: Added.
+
</ins><span class="cx"> 2014-04-19 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Crashes in HTMLFormElement::submit.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsssimplelayoutoverflowexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/simple-layout-overflow-expected.txt (0 => 167580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/simple-layout-overflow-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/simple-layout-overflow-expected.txt 2014-04-21 04:40:11 UTC (rev 167580)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Test passes if it doesn't hit an assertion or crash. a
+b
+-_
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css/simple-layout-overflow-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastcsssimplelayoutoverflowhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/simple-layout-overflow.html (0 => 167580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/simple-layout-overflow.html (rev 0)
+++ trunk/LayoutTests/fast/css/simple-layout-overflow.html 2014-04-21 04:40:11 UTC (rev 167580)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<style>
+p { margin: 5px 1em; width: 0; }
+* { padding-top: 1073741824rem; }
+:first-of-type { position: fixed; }
+</style>
+<p id="a">a</p>
+<p id="b">b</p>
+<p id="c">-_</p>
+Test passes if it doesn't hit an assertion or crash.
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+document.body.parentNode.appendChild(document.getElementById("a"));
+document.body.parentNode.appendChild(document.getElementById("b"));
+document.body.parentNode.appendChild(document.getElementById("c"));
+</script>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/css/simple-layout-overflow.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167579 => 167580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-21 04:39:11 UTC (rev 167579)
+++ trunk/Source/WebCore/ChangeLog 2014-04-21 04:40:11 UTC (rev 167580)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-19 Darin Adler <darin@apple.com>
+
+ Simple layout can get confused by coordinate overflow
+ https://bugs.webkit.org/show_bug.cgi?id=131890
+ rdar://problem/15558510
+
+ Reviewed by Andreas Kling.
+
+ Test: fast/css/simple-layout-overflow.html
+
+ * rendering/SimpleLineLayoutResolver.h:
+ (WebCore::SimpleLineLayout::RunResolver::rangeForRect):
+ If lastLine is smaller than firstList, just ignore it.
+
</ins><span class="cx"> 2014-04-20 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> ScriptExecutionContext::stopActiveDOMObjects iterates a hash map that can change during iteration (for multiple reasons, including GC)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h (167579 => 167580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2014-04-21 04:39:11 UTC (rev 167579)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2014-04-21 04:40:11 UTC (rev 167580)
</span><span class="lines">@@ -283,12 +283,13 @@
</span><span class="cx"> return Range<Iterator>(begin(), end());
</span><span class="cx">
</span><span class="cx"> unsigned firstLine = lineIndexForHeight(rect.y());
</span><del>- unsigned lastLine = lineIndexForHeight(rect.maxY());
</del><ins>+ unsigned lastLine = std::max(firstLine, lineIndexForHeight(rect.maxY()));
</ins><span class="cx">
</span><span class="cx"> auto rangeBegin = begin().advanceLines(firstLine);
</span><span class="cx"> if (rangeBegin == end())
</span><span class="cx"> return Range<Iterator>(end(), end());
</span><span class="cx"> auto rangeEnd = rangeBegin;
</span><ins>+ ASSERT(lastLine >= firstLine);
</ins><span class="cx"> rangeEnd.advanceLines(lastLine - firstLine + 1);
</span><span class="cx"> return Range<Iterator>(rangeBegin, rangeEnd);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>