<!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>[214756] releases/WebKitGTK/webkit-2.16</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/214756">214756</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-03 03:05:29 -0700 (Mon, 03 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/214039">r214039</a> - [css-grid] Crash on debug removing a positioned child
https://bugs.webkit.org/show_bug.cgi?id=169739
Reviewed by Sergio Villar Senin.
Source/WebCore:
When we add or remove a positioned item we don't need to mark
the grid as dirty, because positioned items do not affect the layout
of the grid at all.
This was causing a crash when a positioned item was removed
after a layout. As after the positioned item was removed,
the method RenderGrid::layoutBlock() was not called,
so when the grid was repainted we got a crash.
Test: fast/css-grid-layout/grid-crash-remove-positioned-item.html
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::addChild): Add early return to avoid marking
the grid as dirty for positioned grid items.
(WebCore::RenderGrid::removeChild): Ditto.
LayoutTests:
Add new test that checks that adding and removing a positioned grid item
doesn't cause any crashes.
* fast/css-grid-layout/grid-crash-remove-positioned-item-expected.txt: Added.
* fast/css-grid-layout/grid-crash-remove-positioned-item.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingRenderGridcpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderGrid.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsfastcssgridlayoutgridcrashremovepositioneditemexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css-grid-layout/grid-crash-remove-positioned-item-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsfastcssgridlayoutgridcrashremovepositioneditemhtml">releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css-grid-layout/grid-crash-remove-positioned-item.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (214755 => 214756)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-04-03 09:59:57 UTC (rev 214755)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-04-03 10:05:29 UTC (rev 214756)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-16 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Crash on debug removing a positioned child
+ https://bugs.webkit.org/show_bug.cgi?id=169739
+
+ Reviewed by Sergio Villar Senin.
+
+ Add new test that checks that adding and removing a positioned grid item
+ doesn't cause any crashes.
+
+ * fast/css-grid-layout/grid-crash-remove-positioned-item-expected.txt: Added.
+ * fast/css-grid-layout/grid-crash-remove-positioned-item.html: Added.
+
</ins><span class="cx"> 2017-03-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not reparent floating object until after intruding/overhanging dependency is cleared.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsfastcssgridlayoutgridcrashremovepositioneditemexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css-grid-layout/grid-crash-remove-positioned-item-expected.txt (0 => 214756)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css-grid-layout/grid-crash-remove-positioned-item-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css-grid-layout/grid-crash-remove-positioned-item-expected.txt 2017-04-03 10:05:29 UTC (rev 214756)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+webkit.org/b/169739 - [css-grid] Crash on debug removing a positioned child
+
+This test has PASSED if it does not CRASH on debug.
+
+item
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsfastcssgridlayoutgridcrashremovepositioneditemhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css-grid-layout/grid-crash-remove-positioned-item.html (0 => 214756)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css-grid-layout/grid-crash-remove-positioned-item.html (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/css-grid-layout/grid-crash-remove-positioned-item.html 2017-04-03 10:05:29 UTC (rev 214756)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<p>webkit.org/b/169739 - [css-grid] Crash on debug removing a positioned child</p>
+<p>This test has PASSED if it does not CRASH on debug.</p>
+<div id="grid" style="display: grid;">
+ <!-- This grid item with some text is needed, otherwise RenderGrid::paintChildren()
+ won't be called after removing the positioned item. -->
+ <div>item</div>
+</div>
+<script>
+ var abspositem = document.createElement("div");
+ abspositem.style.position = "absolute";
+ var grid = document.getElementById("grid");
+ grid.appendChild(abspositem);
+ document.body.offsetLeft;
+ grid.removeChild(abspositem);
+</script>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (214755 => 214756)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-03 09:59:57 UTC (rev 214755)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-04-03 10:05:29 UTC (rev 214756)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-03-16 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Crash on debug removing a positioned child
+ https://bugs.webkit.org/show_bug.cgi?id=169739
+
+ Reviewed by Sergio Villar Senin.
+
+ When we add or remove a positioned item we don't need to mark
+ the grid as dirty, because positioned items do not affect the layout
+ of the grid at all.
+
+ This was causing a crash when a positioned item was removed
+ after a layout. As after the positioned item was removed,
+ the method RenderGrid::layoutBlock() was not called,
+ so when the grid was repainted we got a crash.
+
+ Test: fast/css-grid-layout/grid-crash-remove-positioned-item.html
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::addChild): Add early return to avoid marking
+ the grid as dirty for positioned grid items.
+ (WebCore::RenderGrid::removeChild): Ditto.
+
</ins><span class="cx"> 2017-03-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not reparent floating object until after intruding/overhanging dependency is cleared.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderGrid.cpp (214755 => 214756)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderGrid.cpp 2017-04-03 09:59:57 UTC (rev 214755)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderGrid.cpp 2017-04-03 10:05:29 UTC (rev 214756)
</span><span class="lines">@@ -109,6 +109,11 @@
</span><span class="cx"> {
</span><span class="cx"> RenderBlock::addChild(newChild, beforeChild);
</span><span class="cx">
</span><ins>+ // Positioned grid items do not take up space or otherwise participate in the layout of the grid,
+ // for that reason we don't need to mark the grid as dirty when they are added.
+ if (newChild->isOutOfFlowPositioned())
+ return;
+
</ins><span class="cx"> // The grid needs to be recomputed as it might contain auto-placed items that
</span><span class="cx"> // will change their position.
</span><span class="cx"> dirtyGrid();
</span><span class="lines">@@ -118,6 +123,11 @@
</span><span class="cx"> {
</span><span class="cx"> RenderBlock::removeChild(child);
</span><span class="cx">
</span><ins>+ // Positioned grid items do not take up space or otherwise participate in the layout of the grid,
+ // for that reason we don't need to mark the grid as dirty when they are removed.
+ if (child.isOutOfFlowPositioned())
+ return;
+
</ins><span class="cx"> // The grid needs to be recomputed as it might contain auto-placed items that
</span><span class="cx"> // will change their position.
</span><span class="cx"> dirtyGrid();
</span></span></pre>
</div>
</div>
</body>
</html>