<!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>[196983] 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/196983">196983</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2016-02-23 10:17:17 -0800 (Tue, 23 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Avoid duplicated calls to resolution code
https://bugs.webkit.org/show_bug.cgi?id=154336
Reviewed by Sergio Villar Senin.
We were calling GridResolvedPosition::resolveGridPositionsFromStyle()
several times per item.
We can store the GridCoordinates in
RenderGrid::populateExplicitGridAndOrderIterator()
and reuse them in the placement code.
Once RenderGrid::placeItemsOnGrid() is over,
all the items will have a definite position in both axis.
No new tests, no change of behavior.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::insertItemIntoGrid):
(WebCore::RenderGrid::placeItemsOnGrid):
(WebCore::RenderGrid::populateExplicitGridAndOrderIterator):
(WebCore::RenderGrid::placeSpecifiedMajorAxisItemsOnGrid):
(WebCore::RenderGrid::placeAutoMajorAxisItemOnGrid):
(WebCore::RenderGrid::cachedGridCoordinate):
(WebCore::RenderGrid::cachedGridSpan):
* 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 (196982 => 196983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-23 17:57:46 UTC (rev 196982)
+++ trunk/Source/WebCore/ChangeLog 2016-02-23 18:17:17 UTC (rev 196983)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2016-02-23 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><ins>+ [css-grid] Avoid duplicated calls to resolution code
+ https://bugs.webkit.org/show_bug.cgi?id=154336
+
+ Reviewed by Sergio Villar Senin.
+
+ We were calling GridResolvedPosition::resolveGridPositionsFromStyle()
+ several times per item.
+
+ We can store the GridCoordinates in
+ RenderGrid::populateExplicitGridAndOrderIterator()
+ and reuse them in the placement code.
+ Once RenderGrid::placeItemsOnGrid() is over,
+ all the items will have a definite position in both axis.
+
+ No new tests, no change of behavior.
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::insertItemIntoGrid):
+ (WebCore::RenderGrid::placeItemsOnGrid):
+ (WebCore::RenderGrid::populateExplicitGridAndOrderIterator):
+ (WebCore::RenderGrid::placeSpecifiedMajorAxisItemsOnGrid):
+ (WebCore::RenderGrid::placeAutoMajorAxisItemOnGrid):
+ (WebCore::RenderGrid::cachedGridCoordinate):
+ (WebCore::RenderGrid::cachedGridSpan):
+ * rendering/RenderGrid.h:
+
+2016-02-23 Manuel Rego Casasnovas <rego@igalia.com>
+
</ins><span class="cx"> [css-grid] Rows track sizes are optional in grid-template shorthand
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154586
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (196982 => 196983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-02-23 17:57:46 UTC (rev 196982)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-02-23 18:17:17 UTC (rev 196983)
</span><span class="lines">@@ -1138,13 +1138,13 @@
</span><span class="cx">
</span><span class="cx"> void RenderGrid::insertItemIntoGrid(RenderBox& child, const GridCoordinate& coordinate)
</span><span class="cx"> {
</span><ins>+ ASSERT(coordinate.rows.isDefinite() && coordinate.columns.isDefinite());
</ins><span class="cx"> ensureGridSize(coordinate.rows.resolvedFinalPosition().toInt(), coordinate.columns.resolvedFinalPosition().toInt());
</span><span class="cx">
</span><span class="cx"> for (auto& row : coordinate.rows) {
</span><span class="cx"> for (auto& column : coordinate.columns)
</span><span class="cx"> m_grid[row.toInt()][column.toInt()].append(&child);
</span><span class="cx"> }
</span><del>- m_gridItemCoordinate.set(&child, coordinate);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderGrid::placeItemsOnGrid()
</span><span class="lines">@@ -1160,19 +1160,18 @@
</span><span class="cx"> if (child->isOutOfFlowPositioned())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- GridSpan rowPositions = GridResolvedPosition::resolveGridPositionsFromStyle(style(), *child, ForRows);
- GridSpan columnPositions = GridResolvedPosition::resolveGridPositionsFromStyle(style(), *child, ForColumns);
</del><ins>+ GridCoordinate coordinate = cachedGridCoordinate(*child);
</ins><span class="cx">
</span><del>- if (!rowPositions.isDefinite() || !columnPositions.isDefinite()) {
</del><ins>+ if (!coordinate.rows.isDefinite() || !coordinate.columns.isDefinite()) {
</ins><span class="cx"> bool majorAxisDirectionIsForColumns = autoPlacementMajorAxisDirection() == ForColumns;
</span><del>- if ((majorAxisDirectionIsForColumns && !columnPositions.isDefinite())
- || (!majorAxisDirectionIsForColumns && !rowPositions.isDefinite()))
</del><ins>+ if ((majorAxisDirectionIsForColumns && !coordinate.columns.isDefinite())
+ || (!majorAxisDirectionIsForColumns && !coordinate.rows.isDefinite()))
</ins><span class="cx"> autoMajorAxisAutoGridItems.append(child);
</span><span class="cx"> else
</span><span class="cx"> specifiedMajorAxisAutoGridItems.append(child);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- insertItemIntoGrid(*child, GridCoordinate(rowPositions, columnPositions));
</del><ins>+ insertItemIntoGrid(*child, GridCoordinate(coordinate.rows, coordinate.columns));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(gridRowCount() >= GridResolvedPosition::explicitGridRowCount(style()));
</span><span class="lines">@@ -1180,6 +1179,16 @@
</span><span class="cx">
</span><span class="cx"> placeSpecifiedMajorAxisItemsOnGrid(specifiedMajorAxisAutoGridItems);
</span><span class="cx"> placeAutoMajorAxisItemsOnGrid(autoMajorAxisAutoGridItems);
</span><ins>+
+#if ENABLE(ASSERT)
+ for (RenderBox* child = m_orderIterator.first(); child; child = m_orderIterator.next()) {
+ if (child->isOutOfFlowPositioned())
+ continue;
+
+ GridCoordinate coordinate = cachedGridCoordinate(*child);
+ ASSERT(coordinate.rows.isDefinite() && coordinate.columns.isDefinite());
+ }
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderGrid::populateExplicitGridAndOrderIterator()
</span><span class="lines">@@ -1211,6 +1220,8 @@
</span><span class="cx"> GridSpan positions = GridResolvedPosition::resolveGridPositionsFromAutoPlacementPosition(style(), *child, ForColumns, GridResolvedPosition(0));
</span><span class="cx"> maximumColumnIndex = std::max(maximumColumnIndex, positions.resolvedFinalPosition().toInt());
</span><span class="cx"> }
</span><ins>+
+ m_gridItemCoordinate.set(child, GridCoordinate(rowPositions, columnPositions));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_grid.grow(maximumRowIndex);
</span><span class="lines">@@ -1237,8 +1248,9 @@
</span><span class="cx"> HashMap<unsigned, unsigned, DefaultHash<unsigned>::Hash, WTF::UnsignedWithZeroKeyHashTraits<unsigned>> minorAxisCursors;
</span><span class="cx">
</span><span class="cx"> for (auto& autoGridItem : autoGridItems) {
</span><del>- GridSpan majorAxisPositions = GridResolvedPosition::resolveGridPositionsFromStyle(style(), *autoGridItem, autoPlacementMajorAxisDirection());
</del><ins>+ GridSpan majorAxisPositions = cachedGridSpan(*autoGridItem, autoPlacementMajorAxisDirection());
</ins><span class="cx"> ASSERT(majorAxisPositions.isDefinite());
</span><ins>+ ASSERT(!cachedGridSpan(*autoGridItem, autoPlacementMinorAxisDirection()).isDefinite());
</ins><span class="cx"> GridSpan minorAxisPositions = GridResolvedPosition::resolveGridPositionsFromAutoPlacementPosition(style(), *autoGridItem, autoPlacementMinorAxisDirection(), GridResolvedPosition(0));
</span><span class="cx"> unsigned majorAxisInitialPosition = majorAxisPositions.resolvedInitialPosition().toInt();
</span><span class="cx">
</span><span class="lines">@@ -1246,6 +1258,8 @@
</span><span class="cx"> std::unique_ptr<GridCoordinate> emptyGridArea = iterator.nextEmptyGridArea(majorAxisPositions.integerSpan(), minorAxisPositions.integerSpan());
</span><span class="cx"> if (!emptyGridArea)
</span><span class="cx"> emptyGridArea = createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(*autoGridItem, autoPlacementMajorAxisDirection(), majorAxisPositions);
</span><ins>+
+ m_gridItemCoordinate.set(autoGridItem, *emptyGridArea);
</ins><span class="cx"> insertItemIntoGrid(*autoGridItem, *emptyGridArea);
</span><span class="cx">
</span><span class="cx"> if (!isGridAutoFlowDense)
</span><span class="lines">@@ -1270,7 +1284,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderGrid::placeAutoMajorAxisItemOnGrid(RenderBox& gridItem, AutoPlacementCursor& autoPlacementCursor)
</span><span class="cx"> {
</span><del>- ASSERT(!GridResolvedPosition::resolveGridPositionsFromStyle(style(), gridItem, autoPlacementMajorAxisDirection()).isDefinite());
</del><ins>+ ASSERT(!cachedGridSpan(gridItem, autoPlacementMajorAxisDirection()).isDefinite());
</ins><span class="cx"> GridSpan majorAxisPositions = GridResolvedPosition::resolveGridPositionsFromAutoPlacementPosition(style(), gridItem, autoPlacementMajorAxisDirection(), GridResolvedPosition(0));
</span><span class="cx">
</span><span class="cx"> const unsigned endOfMajorAxis = (autoPlacementMajorAxisDirection() == ForColumns) ? gridColumnCount() : gridRowCount();
</span><span class="lines">@@ -1278,7 +1292,7 @@
</span><span class="cx"> unsigned minorAxisAutoPlacementCursor = autoPlacementMajorAxisDirection() == ForColumns ? autoPlacementCursor.first : autoPlacementCursor.second;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<GridCoordinate> emptyGridArea;
</span><del>- GridSpan minorAxisPositions = GridResolvedPosition::resolveGridPositionsFromStyle(style(), gridItem, autoPlacementMinorAxisDirection());
</del><ins>+ GridSpan minorAxisPositions = cachedGridSpan(gridItem, autoPlacementMinorAxisDirection());
</ins><span class="cx"> if (minorAxisPositions.isDefinite()) {
</span><span class="cx"> // Move to the next track in major axis if initial position in minor axis is before auto-placement cursor.
</span><span class="cx"> if (minorAxisPositions.resolvedInitialPosition().toInt() < minorAxisAutoPlacementCursor)
</span><span class="lines">@@ -1318,6 +1332,7 @@
</span><span class="cx"> emptyGridArea = createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(gridItem, autoPlacementMinorAxisDirection(), minorAxisPositions);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ m_gridItemCoordinate.set(&gridItem, *emptyGridArea);
</ins><span class="cx"> insertItemIntoGrid(gridItem, *emptyGridArea);
</span><span class="cx"> autoPlacementCursor.first = emptyGridArea->rows.resolvedInitialPosition().toInt();
</span><span class="cx"> autoPlacementCursor.second = emptyGridArea->columns.resolvedInitialPosition().toInt();
</span><span class="lines">@@ -1506,10 +1521,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+GridCoordinate RenderGrid::cachedGridCoordinate(const RenderBox& gridItem) const
+{
+ ASSERT(m_gridItemCoordinate.contains(&gridItem));
+ return m_gridItemCoordinate.get(&gridItem);
+}
+
</ins><span class="cx"> GridSpan RenderGrid::cachedGridSpan(const RenderBox& gridItem, GridTrackSizingDirection direction) const
</span><span class="cx"> {
</span><del>- ASSERT(m_gridItemCoordinate.contains(&gridItem));
- GridCoordinate coordinate = m_gridItemCoordinate.get(&gridItem);
</del><ins>+ GridCoordinate coordinate = cachedGridCoordinate(gridItem);
</ins><span class="cx"> return direction == ForColumns ? coordinate.columns : coordinate.rows;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (196982 => 196983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h 2016-02-23 17:57:46 UTC (rev 196982)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2016-02-23 18:17:17 UTC (rev 196983)
</span><span class="lines">@@ -140,6 +140,7 @@
</span><span class="cx"> LayoutUnit rowAxisOffsetForChild(const RenderBox&) const;
</span><span class="cx"> ContentAlignmentData computeContentPositionAndDistributionOffset(GridTrackSizingDirection, const LayoutUnit& availableFreeSpace, unsigned numberOfGridTracks) const;
</span><span class="cx"> LayoutPoint findChildLogicalPosition(const RenderBox&) const;
</span><ins>+ GridCoordinate cachedGridCoordinate(const RenderBox&) const;
</ins><span class="cx"> GridSpan cachedGridSpan(const RenderBox&, GridTrackSizingDirection) const;
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>