<!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>[145378] 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/145378">145378</a></dd>
<dt>Author</dt> <dd>jchaffraix@webkit.org</dd>
<dt>Date</dt> <dd>2013-03-11 12:07:54 -0700 (Mon, 11 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[CSS Grid Layout] Handle spanning grid items over specified grid tracks
https://bugs.webkit.org/show_bug.cgi?id=111918

Reviewed by Tony Chang.

Source/WebCore:

This change updates the containing block override logic to handle multiple
spanned tracks. This makes the multiple specified grid tracks case work and
will enable us to handle the minmax case once the computation logic has been
updated.

Test: fast/css-grid-layout/grid-item-spanning-resolution.html

* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::logicalContentHeightForChild):
(WebCore::RenderGrid::layoutGridItems):
Updated these functions to use gridAreaBreadthForChild.

(WebCore::RenderGrid::gridAreaBreadthForChild):
Added this helper function to handle multiple spanned grid tracks.

* rendering/RenderGrid.h: Added the previous function.

LayoutTests:

* fast/css-grid-layout/grid-item-spanning-resolution-expected.txt:
We now pass all the tests.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemspanningresolutionexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridh">trunk/Source/WebCore/rendering/RenderGrid.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (145377 => 145378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-03-11 18:43:48 UTC (rev 145377)
+++ trunk/LayoutTests/ChangeLog        2013-03-11 19:07:54 UTC (rev 145378)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-03-11  Julien Chaffraix  &lt;jchaffraix@webkit.org&gt;
+
+        [CSS Grid Layout] Handle spanning grid items over specified grid tracks
+        https://bugs.webkit.org/show_bug.cgi?id=111918
+
+        Reviewed by Tony Chang.
+
+        * fast/css-grid-layout/grid-item-spanning-resolution-expected.txt:
+        We now pass all the tests.
+
</ins><span class="cx"> 2013-03-11  Christian Biesinger  &lt;cbiesinger@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         (tests) make nodesFromRect.js print a list of nodes that were found
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemspanningresolutionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution-expected.txt (145377 => 145378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution-expected.txt        2013-03-11 18:43:48 UTC (rev 145377)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution-expected.txt        2013-03-11 19:07:54 UTC (rev 145378)
</span><span class="lines">@@ -1,39 +1,13 @@
</span><span class="cx"> Test that spannig rows / columns inside percentage sized grid areas get properly sized.
</span><span class="cx"> 
</span><del>-FAIL:
-Expected 400 for width, but got 160. 
-
-&lt;div class=&quot;grid&quot; data-expected-width=&quot;400&quot; data-expected-height=&quot;300&quot;&gt;
-    &lt;div class=&quot;sizedToGridArea firstRowBothColumn&quot; data-offset-x=&quot;0&quot; data-offset-y=&quot;0&quot; data-expected-width=&quot;400&quot; data-expected-height=&quot;90&quot;&gt;&lt;/div&gt;
-&lt;/div&gt;
-FAIL:
-Expected 400 for width, but got 160. 
-
-&lt;div class=&quot;grid&quot; data-expected-width=&quot;400&quot; data-expected-height=&quot;300&quot;&gt;
-    &lt;div class=&quot;sizedToGridArea secondRowBothColumn&quot; data-offset-x=&quot;0&quot; data-offset-y=&quot;90&quot; data-expected-width=&quot;400&quot; data-expected-height=&quot;210&quot;&gt;&lt;/div&gt;
-&lt;/div&gt;
-FAIL:
-Expected 300 for height, but got 90. 
-
-&lt;div class=&quot;grid&quot; data-expected-width=&quot;400&quot; data-expected-height=&quot;300&quot;&gt;
-    &lt;div class=&quot;sizedToGridArea bothRowFirstColumn&quot; data-offset-x=&quot;0&quot; data-offset-y=&quot;0&quot; data-expected-width=&quot;160&quot; data-expected-height=&quot;300&quot;&gt;&lt;/div&gt;
-&lt;/div&gt;
-FAIL:
-Expected 300 for height, but got 90. 
-
-&lt;div class=&quot;grid&quot; data-expected-width=&quot;400&quot; data-expected-height=&quot;300&quot;&gt;
-    &lt;div class=&quot;sizedToGridArea bothRowSecondColumn&quot; data-offset-x=&quot;160&quot; data-offset-y=&quot;0&quot; data-expected-width=&quot;240&quot; data-expected-height=&quot;300&quot;&gt;&lt;/div&gt;
-&lt;/div&gt;
-FAIL:
-Expected 400 for width, but got 160. 
-Expected 300 for height, but got 90. 
-
-&lt;div class=&quot;grid&quot; data-expected-width=&quot;400&quot; data-expected-height=&quot;300&quot;&gt;
-    &lt;div class=&quot;sizedToGridArea bothRowBothColumn&quot; data-offset-x=&quot;0&quot; data-offset-y=&quot;0&quot; data-expected-width=&quot;400&quot; data-expected-height=&quot;300&quot;&gt;&lt;/div&gt;
-&lt;/div&gt;
</del><span class="cx"> PASS
</span><span class="cx"> PASS
</span><span class="cx"> PASS
</span><ins>+PASS
+PASS
+PASS
+PASS
+PASS
</ins><span class="cx"> FAIL:
</span><span class="cx"> Expected 240 for width, but got 160. 
</span><span class="cx"> Expected 160 for offsetLeft, but got 0. 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (145377 => 145378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-03-11 18:43:48 UTC (rev 145377)
+++ trunk/Source/WebCore/ChangeLog        2013-03-11 19:07:54 UTC (rev 145378)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2013-03-11  Julien Chaffraix  &lt;jchaffraix@webkit.org&gt;
+
+        [CSS Grid Layout] Handle spanning grid items over specified grid tracks
+        https://bugs.webkit.org/show_bug.cgi?id=111918
+
+        Reviewed by Tony Chang.
+
+        This change updates the containing block override logic to handle multiple
+        spanned tracks. This makes the multiple specified grid tracks case work and
+        will enable us to handle the minmax case once the computation logic has been
+        updated.
+
+        Test: fast/css-grid-layout/grid-item-spanning-resolution.html
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::logicalContentHeightForChild):
+        (WebCore::RenderGrid::layoutGridItems):
+        Updated these functions to use gridAreaBreadthForChild.
+
+        (WebCore::RenderGrid::gridAreaBreadthForChild):
+        Added this helper function to handle multiple spanned grid tracks.
+
+        * rendering/RenderGrid.h: Added the previous function.
+
</ins><span class="cx"> 2013-03-11  Philip Rogers  &lt;pdr@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Replace SVG's static_cast&lt;SVGElement&gt; with toSVGElement()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (145377 => 145378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp        2013-03-11 18:43:48 UTC (rev 145377)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp        2013-03-11 19:07:54 UTC (rev 145378)
</span><span class="lines">@@ -359,8 +359,7 @@
</span><span class="cx">     if (!child-&gt;needsLayout())
</span><span class="cx">         child-&gt;setNeedsLayout(true, MarkOnlyThis);
</span><span class="cx"> 
</span><del>-    const GridCoordinate&amp; coordinate = cachedGridCoordinate(child);
-    child-&gt;setOverrideContainingBlockContentLogicalWidth(columnTracks[coordinate.columnIndex].m_usedBreadth);
</del><ins>+    child-&gt;setOverrideContainingBlockContentLogicalWidth(gridAreaBreadthForChild(child, ForColumns, columnTracks));
</ins><span class="cx">     child-&gt;clearOverrideContainingBlockContentLogicalHeight();
</span><span class="cx">     child-&gt;layout();
</span><span class="cx">     return child-&gt;logicalHeight();
</span><span class="lines">@@ -645,8 +644,6 @@
</span><span class="cx">     for (RenderBox* child = firstChildBox(); child; child = child-&gt;nextSiblingBox()) {
</span><span class="cx">         LayoutPoint childPosition = findChildLogicalPosition(child, columnTracks, rowTracks);
</span><span class="cx"> 
</span><del>-        const GridCoordinate&amp; childCoordinate = cachedGridCoordinate(child);
-
</del><span class="cx">         // Because the grid area cannot be styled, we don't need to adjust
</span><span class="cx">         // the grid breadth to account for 'box-sizing'.
</span><span class="cx">         LayoutUnit oldOverrideContainingBlockContentLogicalWidth = child-&gt;hasOverrideContainingBlockLogicalWidth() ? child-&gt;overrideContainingBlockContentLogicalWidth() : LayoutUnit();
</span><span class="lines">@@ -654,11 +651,13 @@
</span><span class="cx"> 
</span><span class="cx">         // FIXME: For children in a content sized track, we clear the overrideContainingBlockContentLogicalHeight
</span><span class="cx">         // in minContentForChild / maxContentForChild which means that we will always relayout the child.
</span><del>-        if (oldOverrideContainingBlockContentLogicalWidth != columnTracks[childCoordinate.columnIndex].m_usedBreadth || oldOverrideContainingBlockContentLogicalHeight != rowTracks[childCoordinate.rowIndex].m_usedBreadth)
</del><ins>+        LayoutUnit overrideContainingBlockContentLogicalWidth = gridAreaBreadthForChild(child, ForColumns, columnTracks);
+        LayoutUnit overrideContainingBlockContentLogicalHeight = gridAreaBreadthForChild(child, ForRows, rowTracks);
+        if (oldOverrideContainingBlockContentLogicalWidth != overrideContainingBlockContentLogicalWidth || oldOverrideContainingBlockContentLogicalHeight != overrideContainingBlockContentLogicalHeight)
</ins><span class="cx">             child-&gt;setNeedsLayout(true, MarkOnlyThis);
</span><span class="cx"> 
</span><del>-        child-&gt;setOverrideContainingBlockContentLogicalWidth(columnTracks[childCoordinate.columnIndex].m_usedBreadth);
-        child-&gt;setOverrideContainingBlockContentLogicalHeight(rowTracks[childCoordinate.rowIndex].m_usedBreadth);
</del><ins>+        child-&gt;setOverrideContainingBlockContentLogicalWidth(overrideContainingBlockContentLogicalWidth);
+        child-&gt;setOverrideContainingBlockContentLogicalHeight(overrideContainingBlockContentLogicalHeight);
</ins><span class="cx"> 
</span><span class="cx">         // FIXME: Grid items should stretch to fill their cells. Once we
</span><span class="cx">         // implement grid-{column,row}-align, we can also shrink to fit. For
</span><span class="lines">@@ -742,6 +741,23 @@
</span><span class="cx">     return 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+LayoutUnit RenderGrid::gridAreaBreadthForChild(const RenderBox* child, TrackSizingDirection direction, const Vector&lt;GridTrack&gt;&amp; tracks) const
+{
+    const GridCoordinate&amp; coordinate = cachedGridCoordinate(child);
+    size_t trackIndex = (direction == ForColumns) ? coordinate.columnIndex : coordinate.rowIndex;
+    OwnPtr&lt;GridSpan&gt; span = resolveGridPositionsFromStyle(child, direction);
+    if (!span) {
+        // FIXME: We don't support spanning with auto positions yet. Once we do, this is wrong.
+        span = adoptPtr(new GridSpan(trackIndex, trackIndex));
+    }
+
+    ASSERT(span-&gt;initialPositionIndex == trackIndex);
+    LayoutUnit gridAreaBreadth = 0;
+    for (; trackIndex &lt;= span-&gt;finalPositionIndex; ++trackIndex)
+        gridAreaBreadth += tracks[trackIndex].m_usedBreadth;
+    return gridAreaBreadth;
+}
+
</ins><span class="cx"> LayoutPoint RenderGrid::findChildLogicalPosition(RenderBox* child, const Vector&lt;GridTrack&gt;&amp; columnTracks, const Vector&lt;GridTrack&gt;&amp; rowTracks)
</span><span class="cx"> {
</span><span class="cx">     const GridCoordinate&amp; coordinate = cachedGridCoordinate(child);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (145377 => 145378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h        2013-03-11 18:43:48 UTC (rev 145377)
+++ trunk/Source/WebCore/rendering/RenderGrid.h        2013-03-11 19:07:54 UTC (rev 145378)
</span><span class="lines">@@ -125,6 +125,8 @@
</span><span class="cx">     };
</span><span class="cx">     size_t resolveGridPositionFromStyle(const GridPosition&amp;, GridPositionSide) const;
</span><span class="cx"> 
</span><ins>+    LayoutUnit gridAreaBreadthForChild(const RenderBox* child, TrackSizingDirection, const Vector&lt;GridTrack&gt;&amp;) const;
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     bool tracksAreWiderThanMinTrackBreadth(TrackSizingDirection, const Vector&lt;GridTrack&gt;&amp;);
</span><span class="cx">     bool gridWasPopulated() const { return !m_grid.isEmpty() &amp;&amp; !m_grid[0].isEmpty(); }
</span></span></pre>
</div>
</div>

</body>
</html>