<!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>[175538] branches/safari-600.2-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/175538">175538</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-11-04 03:12:49 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/174946">r174946</a>. <rdar://problems/18856024></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6002branchLayoutTestsChangeLog">branches/safari-600.2-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6002branchSourceWebCoreChangeLog">branches/safari-600.2-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6002branchSourceWebCorerenderingRenderGridcpp">branches/safari-600.2-branch/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#branchessafari6002branchSourceWebCorerenderingRenderGridh">branches/safari-600.2-branch/Source/WebCore/rendering/RenderGrid.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6002branchLayoutTestsfastcssgridlayoutgridwaspopulatedassertexpectedtxt">branches/safari-600.2-branch/LayoutTests/fast/css-grid-layout/grid-was-populated-assert-expected.txt</a></li>
<li><a href="#branchessafari6002branchLayoutTestsfastcssgridlayoutgridwaspopulatedasserthtml">branches/safari-600.2-branch/LayoutTests/fast/css-grid-layout/grid-was-populated-assert.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6002branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/LayoutTests/ChangeLog (175537 => 175538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/LayoutTests/ChangeLog 2014-11-04 11:09:25 UTC (rev 175537)
+++ branches/safari-600.2-branch/LayoutTests/ChangeLog 2014-11-04 11:12:49 UTC (rev 175538)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-11-04 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174946. <rdar://problem/18856024>
+
+ 2014-10-21 Manuel Rego Casasnovas <rego@igalia.com>
+
+ ASSERTION FAILED: !gridWasPopulated() in WebCore::RenderGrid::placeItemsOnGrid
+ https://bugs.webkit.org/show_bug.cgi?id=136939
+
+ Reviewed by Darin Adler.
+
+ Added a test case to reproduce the crash in debug mode.
+
+ * fast/css-grid-layout/grid-was-populated-assert-expected.txt: Added.
+ * fast/css-grid-layout/grid-was-populated-assert.html: Added.
+
+
+2014-11-04 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r174922. <rdar://problem/18856052>
</span><span class="cx">
</span><span class="cx"> 2014-10-17 Jeffrey Pfau <jpfau@apple.com>
</span></span></pre></div>
<a id="branchessafari6002branchLayoutTestsfastcssgridlayoutgridwaspopulatedassertexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-600.2-branch/LayoutTests/fast/css-grid-layout/grid-was-populated-assert-expected.txt (0 => 175538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/LayoutTests/fast/css-grid-layout/grid-was-populated-assert-expected.txt (rev 0)
+++ branches/safari-600.2-branch/LayoutTests/fast/css-grid-layout/grid-was-populated-assert-expected.txt 2014-11-04 11:12:49 UTC (rev 175538)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This test passes if it does not crash in debug mode.
+
+
+
</ins></span></pre></div>
<a id="branchessafari6002branchLayoutTestsfastcssgridlayoutgridwaspopulatedasserthtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.2-branch/LayoutTests/fast/css-grid-layout/grid-was-populated-assert.html (0 => 175538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/LayoutTests/fast/css-grid-layout/grid-was-populated-assert.html (rev 0)
+++ branches/safari-600.2-branch/LayoutTests/fast/css-grid-layout/grid-was-populated-assert.html 2014-11-04 11:12:49 UTC (rev 175538)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ }
+ </script>
+ <style>
+ details {
+ display: -webkit-grid;
+ -webkit-columns: 5;
+ }
+ div {
+ display: -webkit-grid;
+ }
+ input {
+ -webkit-columns: 5;
+ }
+ </style>
+</head>
+<body>
+ <p>This test passes if it does not crash in debug mode.</p>
+ <details open>
+ <button>
+ <div>
+ <input placeholder="testing" />
+ </div>
+ </button>
+ </details>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6002branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/ChangeLog (175537 => 175538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/ChangeLog 2014-11-04 11:09:25 UTC (rev 175537)
+++ branches/safari-600.2-branch/Source/WebCore/ChangeLog 2014-11-04 11:12:49 UTC (rev 175538)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2014-11-04 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174946. <rdar://problem/18856024>
+
+ 2014-10-21 Manuel Rego Casasnovas <rego@igalia.com>
+
+ ASSERTION FAILED: !gridWasPopulated() in WebCore::RenderGrid::placeItemsOnGrid
+ https://bugs.webkit.org/show_bug.cgi?id=136939
+
+ Reviewed by Darin Adler.
+
+ In some particular situations computeIntrinsicLogicalWidths() is called
+ in the middle of layoutGridItems(). In these cases we do not need to
+ populate the grid again, so we should avoid calling placeItemsOnGrid().
+ In addition, we do not need to clean the grid either, as that will be
+ done later by layoutGridItems().
+
+ Test: fast/css-grid-layout/grid-was-populated-assert.html
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::computeIntrinsicLogicalWidths): Avoid calls to
+ placeItemsOnGrid() and clearGrid() if the grid was already populated.
+ * rendering/RenderGrid.h: Move gridWasPopulated() header out of the
+ debug ifdefs.
+
+
+2014-11-04 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r174922. <rdar://problem/18856052>
</span><span class="cx">
</span><span class="cx"> 2014-10-17 Jeffrey Pfau <jpfau@apple.com>
</span></span></pre></div>
<a id="branchessafari6002branchSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/rendering/RenderGrid.cpp (175537 => 175538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/rendering/RenderGrid.cpp 2014-11-04 11:09:25 UTC (rev 175537)
+++ branches/safari-600.2-branch/Source/WebCore/rendering/RenderGrid.cpp 2014-11-04 11:12:49 UTC (rev 175538)
</span><span class="lines">@@ -241,7 +241,9 @@
</span><span class="cx">
</span><span class="cx"> void RenderGrid::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
</span><span class="cx"> {
</span><del>- const_cast<RenderGrid*>(this)->placeItemsOnGrid();
</del><ins>+ bool wasPopulated = gridWasPopulated();
+ if (!wasPopulated)
+ const_cast<RenderGrid*>(this)->placeItemsOnGrid();
</ins><span class="cx">
</span><span class="cx"> GridSizingData sizingData(gridColumnCount(), gridRowCount());
</span><span class="cx"> LayoutUnit availableLogicalSpace = 0;
</span><span class="lines">@@ -258,7 +260,8 @@
</span><span class="cx"> // FIXME: This should add in the scrollbarWidth (e.g. see RenderFlexibleBox).
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const_cast<RenderGrid*>(this)->clearGrid();
</del><ins>+ if (!wasPopulated)
+ const_cast<RenderGrid*>(this)->clearGrid();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderGrid::computePreferredLogicalWidths()
</span></span></pre></div>
<a id="branchessafari6002branchSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebCore/rendering/RenderGrid.h (175537 => 175538)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.2-branch/Source/WebCore/rendering/RenderGrid.h 2014-11-04 11:09:25 UTC (rev 175537)
+++ branches/safari-600.2-branch/Source/WebCore/rendering/RenderGrid.h 2014-11-04 11:12:49 UTC (rev 175538)
</span><span class="lines">@@ -109,9 +109,10 @@
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, const Vector<GridTrack>&);
</span><del>- bool gridWasPopulated() const { return !m_grid.isEmpty() && !m_grid[0].isEmpty(); }
</del><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ bool gridWasPopulated() const { return !m_grid.isEmpty() && !m_grid[0].isEmpty(); }
+
</ins><span class="cx"> size_t gridColumnCount() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(gridWasPopulated());
</span></span></pre>
</div>
</div>
</body>
</html>