<!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>[201379] trunk/Source/WebCore</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/201379">201379</a></dd>
<dt>Author</dt> <dd>svillar@igalia.com</dd>
<dt>Date</dt> <dd>2016-05-25 04:32:30 -0700 (Wed, 25 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Refactor populateGridPositions()
https://bugs.webkit.org/show_bug.cgi?id=158065
Reviewed by Carlos Garcia Campos.
RenderGrid::populateGridPositions() was doing exactly the same thing for columns and rows
but using different data structures. That lead to a lot of duplicated code. It's easy to
refactor it in a new function that properly select the data structures to operate on based
on the direction.
No new tests as there is no change in behaviour.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::layoutGridItems):
(WebCore::RenderGrid::populateGridPositionsForDirection): Refactored from
populateGridPositions().
(WebCore::RenderGrid::populateGridPositions): Deleted.
* rendering/RenderGrid.h:</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201378 => 201379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-25 11:17:38 UTC (rev 201378)
+++ trunk/Source/WebCore/ChangeLog 2016-05-25 11:32:30 UTC (rev 201379)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-25 Sergio Villar Senin <svillar@igalia.com>
+
+ [css-grid] Refactor populateGridPositions()
+ https://bugs.webkit.org/show_bug.cgi?id=158065
+
+ Reviewed by Carlos Garcia Campos.
+
+ RenderGrid::populateGridPositions() was doing exactly the same thing for columns and rows
+ but using different data structures. That lead to a lot of duplicated code. It's easy to
+ refactor it in a new function that properly select the data structures to operate on based
+ on the direction.
+
+ No new tests as there is no change in behaviour.
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::layoutGridItems):
+ (WebCore::RenderGrid::populateGridPositionsForDirection): Refactored from
+ populateGridPositions().
+ (WebCore::RenderGrid::populateGridPositions): Deleted.
+ * rendering/RenderGrid.h:
+
</ins><span class="cx"> 2016-05-25 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201373.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (201378 => 201379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-05-25 11:17:38 UTC (rev 201378)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-05-25 11:32:30 UTC (rev 201379)
</span><span class="lines">@@ -1549,7 +1549,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderGrid::layoutGridItems(GridSizingData& sizingData)
</span><span class="cx"> {
</span><del>- populateGridPositions(sizingData);
</del><ins>+ populateGridPositionsForDirection(sizingData, ForColumns);
+ populateGridPositionsForDirection(sizingData, ForRows);
</ins><span class="cx">
</span><span class="cx"> for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
</span><span class="cx"> if (child->isOutOfFlowPositioned()) {
</span><span class="lines">@@ -1751,7 +1752,7 @@
</span><span class="cx"> return finalTrackPosition - initialTrackPosition + tracks[span.endLine() - 1].baseSize();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderGrid::populateGridPositions(GridSizingData& sizingData)
</del><ins>+void RenderGrid::populateGridPositionsForDirection(GridSizingData& sizingData, GridTrackSizingDirection direction)
</ins><span class="cx"> {
</span><span class="cx"> // Since we add alignment offsets and track gutters, grid lines are not always adjacent. Hence we will have to
</span><span class="cx"> // assume from now on that we just store positions of the initial grid lines of each track,
</span><span class="lines">@@ -1760,31 +1761,23 @@
</span><span class="cx"> // The grid container's frame elements (border, padding and <content-position> offset) are sensible to the
</span><span class="cx"> // inline-axis flow direction. However, column lines positions are 'direction' unaware. This simplification
</span><span class="cx"> // allows us to use the same indexes to identify the columns independently on the inline-axis direction.
</span><del>- unsigned numberOfTracks = sizingData.columnTracks.size();
</del><ins>+ bool isRowAxis = direction == ForColumns;
+ auto& tracks = isRowAxis ? sizingData.columnTracks : sizingData.rowTracks;
+ unsigned numberOfTracks = tracks.size();
</ins><span class="cx"> unsigned numberOfLines = numberOfTracks + 1;
</span><span class="cx"> unsigned lastLine = numberOfLines - 1;
</span><span class="cx"> unsigned nextToLastLine = numberOfLines - 2;
</span><del>- ContentAlignmentData offset = computeContentPositionAndDistributionOffset(ForColumns, sizingData.freeSpaceForDirection(ForColumns).value(), numberOfTracks);
- LayoutUnit trackGap = guttersSize(ForColumns, 2);
- m_columnPositions.resize(numberOfLines);
- m_columnPositions[0] = borderAndPaddingLogicalLeft() + offset.positionOffset;
</del><ins>+ ContentAlignmentData offset = computeContentPositionAndDistributionOffset(direction, sizingData.freeSpaceForDirection(direction).value(), numberOfTracks);
+ LayoutUnit trackGap = guttersSize(direction, 2);
+ auto& positions = isRowAxis ? m_columnPositions : m_rowPositions;
+ positions.resize(numberOfLines);
+ auto borderAndPadding = isRowAxis ? borderAndPaddingLogicalLeft() : borderAndPaddingBefore();
+ positions[0] = borderAndPadding + offset.positionOffset;
</ins><span class="cx"> for (unsigned i = 0; i < nextToLastLine; ++i)
</span><del>- m_columnPositions[i + 1] = m_columnPositions[i] + offset.distributionOffset + sizingData.columnTracks[i].baseSize() + trackGap;
- m_columnPositions[lastLine] = m_columnPositions[nextToLastLine] + sizingData.columnTracks[nextToLastLine].baseSize();
- m_offsetBetweenColumns = offset.distributionOffset;
-
- numberOfTracks = sizingData.rowTracks.size();
- numberOfLines = numberOfTracks + 1;
- lastLine = numberOfLines - 1;
- nextToLastLine = numberOfLines - 2;
- offset = computeContentPositionAndDistributionOffset(ForRows, sizingData.freeSpaceForDirection(ForRows).value(), numberOfTracks);
- trackGap = guttersSize(ForRows, 2);
- m_rowPositions.resize(numberOfLines);
- m_rowPositions[0] = borderAndPaddingBefore() + offset.positionOffset;
- for (unsigned i = 0; i < nextToLastLine; ++i)
- m_rowPositions[i + 1] = m_rowPositions[i] + offset.distributionOffset + sizingData.rowTracks[i].baseSize() + trackGap;
- m_rowPositions[lastLine] = m_rowPositions[nextToLastLine] + sizingData.rowTracks[nextToLastLine].baseSize();
- m_offsetBetweenRows = offset.distributionOffset;
</del><ins>+ positions[i + 1] = positions[i] + offset.distributionOffset + tracks[i].baseSize() + trackGap;
+ positions[lastLine] = positions[nextToLastLine] + tracks[nextToLastLine].baseSize();
+ auto& offsetBetweenTracks = isRowAxis ? m_offsetBetweenColumns : m_offsetBetweenRows;
+ offsetBetweenTracks = offset.distributionOffset;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline LayoutUnit computeOverflowAlignmentOffset(OverflowAlignment overflow, LayoutUnit trackBreadth, LayoutUnit childBreadth)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (201378 => 201379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h 2016-05-25 11:17:38 UTC (rev 201378)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2016-05-25 11:32:30 UTC (rev 201379)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> void computeTrackSizesForDirection(GridTrackSizingDirection, GridSizingData&, LayoutUnit freeSpace);
</span><span class="cx">
</span><span class="cx"> void layoutGridItems(GridSizingData&);
</span><del>- void populateGridPositions(GridSizingData&);
</del><ins>+ void populateGridPositionsForDirection(GridSizingData&, GridTrackSizingDirection);
</ins><span class="cx"> void clearGrid();
</span><span class="cx">
</span><span class="cx"> enum TrackSizeRestriction {
</span></span></pre>
</div>
</div>
</body>
</html>