<!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>[192156] 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/192156">192156</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2015-11-09 06:46:49 -0800 (Mon, 09 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Refactor cachedGridCoordinate() to cachedGridSpan()
https://bugs.webkit.org/show_bug.cgi?id=151017
Reviewed by Sergio Villar Senin.
We were using cachedGridCoordinate() in lots of places and checking the
direction just in the next line. Creating a generic function to do this.
No new tests, no behavior change.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::computeUsedBreadthOfGridTracks):
(WebCore::GridItemWithSpan::GridItemWithSpan):
(WebCore::GridItemWithSpan::span):
(WebCore::GridItemWithSpan::operator<):
(WebCore::RenderGrid::spanningItemCrossesFlexibleSizedTracks):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForItems):
(WebCore::RenderGrid::cachedGridSpan):
(WebCore::RenderGrid::gridAreaBreadthForChild):
(WebCore::RenderGrid::gridAreaBreadthForChildIncludingAlignmentOffsets):
(WebCore::RenderGrid::columnAxisOffsetForChild):
(WebCore::RenderGrid::rowAxisOffsetForChild):
(WebCore::GridItemWithSpan::gridItem): Deleted.
(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 (192155 => 192156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-09 14:15:21 UTC (rev 192155)
+++ trunk/Source/WebCore/ChangeLog 2015-11-09 14:46:49 UTC (rev 192156)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-11-09 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Refactor cachedGridCoordinate() to cachedGridSpan()
+ https://bugs.webkit.org/show_bug.cgi?id=151017
+
+ Reviewed by Sergio Villar Senin.
+
+ We were using cachedGridCoordinate() in lots of places and checking the
+ direction just in the next line. Creating a generic function to do this.
+
+ No new tests, no behavior change.
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::computeUsedBreadthOfGridTracks):
+ (WebCore::GridItemWithSpan::GridItemWithSpan):
+ (WebCore::GridItemWithSpan::span):
+ (WebCore::GridItemWithSpan::operator<):
+ (WebCore::RenderGrid::spanningItemCrossesFlexibleSizedTracks):
+ (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
+ (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems):
+ (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctionsForItems):
+ (WebCore::RenderGrid::cachedGridSpan):
+ (WebCore::RenderGrid::gridAreaBreadthForChild):
+ (WebCore::RenderGrid::gridAreaBreadthForChildIncludingAlignmentOffsets):
+ (WebCore::RenderGrid::columnAxisOffsetForChild):
+ (WebCore::RenderGrid::rowAxisOffsetForChild):
+ (WebCore::GridItemWithSpan::gridItem): Deleted.
+ (WebCore::RenderGrid::populateGridPositions): Deleted.
+ * rendering/RenderGrid.h:
+
</ins><span class="cx"> 2015-11-09 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> JS Built-ins functions should be able to assert
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (192155 => 192156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-11-09 14:15:21 UTC (rev 192155)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-11-09 14:46:49 UTC (rev 192156)
</span><span class="lines">@@ -562,8 +562,7 @@
</span><span class="cx"> for (unsigned i = 0; i < flexibleSizedTracksIndex.size(); ++i) {
</span><span class="cx"> GridIterator iterator(m_grid, direction, flexibleSizedTracksIndex[i]);
</span><span class="cx"> while (RenderBox* gridItem = iterator.nextGridItem()) {
</span><del>- const GridCoordinate coordinate = cachedGridCoordinate(*gridItem);
- const GridSpan span = (direction == ForColumns) ? coordinate.columns : coordinate.rows;
</del><ins>+ const GridSpan span = cachedGridSpan(*gridItem, direction);
</ins><span class="cx">
</span><span class="cx"> // Do not include already processed items.
</span><span class="cx"> if (i > 0 && span.resolvedInitialPosition.toInt() <= flexibleSizedTracksIndex[i - 1])
</span><span class="lines">@@ -778,34 +777,27 @@
</span><span class="cx">
</span><span class="cx"> class GridItemWithSpan {
</span><span class="cx"> public:
</span><del>- GridItemWithSpan(RenderBox& gridItem, GridCoordinate coordinate, GridTrackSizingDirection direction)
</del><ins>+ GridItemWithSpan(RenderBox& gridItem, GridSpan span)
</ins><span class="cx"> : m_gridItem(gridItem)
</span><del>- , m_coordinate(coordinate)
</del><ins>+ , m_span(span)
</ins><span class="cx"> {
</span><del>- const GridSpan& span = (direction == ForRows) ? coordinate.rows : coordinate.columns;
- m_span = span.resolvedFinalPosition.toInt() - span.resolvedInitialPosition.toInt() + 1;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBox& gridItem() const { return m_gridItem; }
</span><del>- GridCoordinate coordinate() const { return m_coordinate; }
-#if !ASSERT_DISABLED
- size_t span() const { return m_span; }
-#endif
</del><ins>+ GridSpan span() const { return m_span; }
</ins><span class="cx">
</span><span class="cx"> bool operator<(const GridItemWithSpan other) const
</span><span class="cx"> {
</span><del>- return m_span < other.m_span;
</del><ins>+ return m_span.integerSpan() < other.m_span.integerSpan();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> std::reference_wrapper<RenderBox> m_gridItem;
</span><del>- GridCoordinate m_coordinate;
- unsigned m_span;
</del><ins>+ GridSpan m_span;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-bool RenderGrid::spanningItemCrossesFlexibleSizedTracks(const GridCoordinate& coordinate, GridTrackSizingDirection direction) const
</del><ins>+bool RenderGrid::spanningItemCrossesFlexibleSizedTracks(const GridSpan& itemSpan, GridTrackSizingDirection direction) const
</ins><span class="cx"> {
</span><del>- const GridSpan itemSpan = (direction == ForColumns) ? coordinate.columns : coordinate.rows;
</del><span class="cx"> for (auto trackPosition : itemSpan) {
</span><span class="cx"> const GridTrackSize& trackSize = gridTrackSize(direction, trackPosition.toInt());
</span><span class="cx"> if (trackSize.minTrackBreadth().isFlex() || trackSize.maxTrackBreadth().isFlex())
</span><span class="lines">@@ -815,11 +807,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline unsigned integerSpanForDirection(const GridCoordinate& coordinate, GridTrackSizingDirection direction)
-{
- return (direction == ForRows) ? coordinate.rows.integerSpan() : coordinate.columns.integerSpan();
-}
-
</del><span class="cx"> struct GridItemsSpanGroupRange {
</span><span class="cx"> Vector<GridItemWithSpan>::iterator rangeStart;
</span><span class="cx"> Vector<GridItemWithSpan>::iterator rangeEnd;
</span><span class="lines">@@ -835,11 +822,11 @@
</span><span class="cx">
</span><span class="cx"> while (RenderBox* gridItem = iterator.nextGridItem()) {
</span><span class="cx"> if (itemsSet.add(gridItem).isNewEntry) {
</span><del>- const GridCoordinate& coordinate = cachedGridCoordinate(*gridItem);
- if (integerSpanForDirection(coordinate, direction) == 1)
- resolveContentBasedTrackSizingFunctionsForNonSpanningItems(direction, coordinate, *gridItem, track, sizingData.columnTracks);
- else if (!spanningItemCrossesFlexibleSizedTracks(coordinate, direction))
- sizingData.itemsSortedByIncreasingSpan.append(GridItemWithSpan(*gridItem, coordinate, direction));
</del><ins>+ const GridSpan& span = cachedGridSpan(*gridItem, direction);
+ if (span.integerSpan() == 1)
+ resolveContentBasedTrackSizingFunctionsForNonSpanningItems(direction, span, *gridItem, track, sizingData.columnTracks);
+ else if (!spanningItemCrossesFlexibleSizedTracks(span, direction))
+ sizingData.itemsSortedByIncreasingSpan.append(GridItemWithSpan(*gridItem, span));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -864,9 +851,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection direction, const GridCoordinate& coordinate, RenderBox& gridItem, GridTrack& track, Vector<GridTrack>& columnTracks)
</del><ins>+void RenderGrid::resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection direction, const GridSpan& span, RenderBox& gridItem, GridTrack& track, Vector<GridTrack>& columnTracks)
</ins><span class="cx"> {
</span><del>- const GridResolvedPosition trackPosition = (direction == ForColumns) ? coordinate.columns.resolvedInitialPosition : coordinate.rows.resolvedInitialPosition;
</del><ins>+ const GridResolvedPosition trackPosition = span.resolvedInitialPosition;
</ins><span class="cx"> GridTrackSize trackSize = gridTrackSize(direction, trackPosition.toInt());
</span><span class="cx">
</span><span class="cx"> if (trackSize.hasMinContentMinTrackBreadth())
</span><span class="lines">@@ -1015,9 +1002,8 @@
</span><span class="cx">
</span><span class="cx"> for (auto it = gridItemsWithSpan.rangeStart; it != gridItemsWithSpan.rangeEnd; ++it) {
</span><span class="cx"> GridItemWithSpan& gridItemWithSpan = *it;
</span><del>- ASSERT(gridItemWithSpan.span() > 1);
- const GridCoordinate& coordinate = gridItemWithSpan.coordinate();
- const GridSpan& itemSpan = (direction == ForColumns) ? coordinate.columns : coordinate.rows;
</del><ins>+ ASSERT(gridItemWithSpan.span().integerSpan() > 1);
+ const GridSpan& itemSpan = gridItemWithSpan.span();
</ins><span class="cx">
</span><span class="cx"> sizingData.filteredTracks.shrink(0);
</span><span class="cx"> sizingData.growBeyondGrowthLimitsTracks.shrink(0);
</span><span class="lines">@@ -1517,16 +1503,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GridCoordinate RenderGrid::cachedGridCoordinate(const RenderBox& gridItem) const
</del><ins>+GridSpan RenderGrid::cachedGridSpan(const RenderBox& gridItem, GridTrackSizingDirection direction) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_gridItemCoordinate.contains(&gridItem));
</span><del>- return m_gridItemCoordinate.get(&gridItem);
</del><ins>+ GridCoordinate coordinate = m_gridItemCoordinate.get(&gridItem);
+ return direction == ForColumns ? coordinate.columns : coordinate.rows;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderGrid::gridAreaBreadthForChild(const RenderBox& child, GridTrackSizingDirection direction, const Vector<GridTrack>& tracks) const
</span><span class="cx"> {
</span><del>- const GridCoordinate& coordinate = cachedGridCoordinate(child);
- const GridSpan& span = (direction == ForColumns) ? coordinate.columns : coordinate.rows;
</del><ins>+ const GridSpan& span = cachedGridSpan(child, direction);
</ins><span class="cx"> LayoutUnit gridAreaBreadth = 0;
</span><span class="cx"> for (auto& trackPosition : span)
</span><span class="cx"> gridAreaBreadth += tracks[trackPosition.toInt()].baseSize();
</span><span class="lines">@@ -1541,8 +1527,7 @@
</span><span class="cx"> // We need the cached value when available because Content Distribution alignment properties
</span><span class="cx"> // may have some influence in the final grid area breadth.
</span><span class="cx"> const auto& tracks = (direction == ForColumns) ? sizingData.columnTracks : sizingData.rowTracks;
</span><del>- const auto& coordinate = cachedGridCoordinate(child);
- const auto& span = (direction == ForColumns) ? coordinate.columns : coordinate.rows;
</del><ins>+ const auto& span = cachedGridSpan(child, direction);
</ins><span class="cx"> const auto& linePositions = (direction == ForColumns) ? m_columnPositions : m_rowPositions;
</span><span class="cx">
</span><span class="cx"> LayoutUnit initialTrackPosition = linePositions[span.resolvedInitialPosition.toInt()];
</span><span class="lines">@@ -1844,8 +1829,8 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderGrid::columnAxisOffsetForChild(const RenderBox& child) const
</span><span class="cx"> {
</span><del>- const GridCoordinate& coordinate = cachedGridCoordinate(child);
- unsigned childStartLine = coordinate.rows.resolvedInitialPosition.toInt();
</del><ins>+ const GridSpan& rowsSpan = cachedGridSpan(child, ForRows);
+ unsigned childStartLine = rowsSpan.resolvedInitialPosition.toInt();
</ins><span class="cx"> LayoutUnit startOfRow = m_rowPositions[childStartLine];
</span><span class="cx"> LayoutUnit startPosition = startOfRow + marginBeforeForChild(child);
</span><span class="cx"> if (hasAutoMarginsInColumnAxis(child))
</span><span class="lines">@@ -1856,7 +1841,7 @@
</span><span class="cx"> return startPosition;
</span><span class="cx"> case GridAxisEnd:
</span><span class="cx"> case GridAxisCenter: {
</span><del>- unsigned childEndLine = coordinate.rows.resolvedFinalPosition.next().toInt();
</del><ins>+ unsigned childEndLine = rowsSpan.resolvedFinalPosition.next().toInt();
</ins><span class="cx"> LayoutUnit endOfRow = m_rowPositions[childEndLine];
</span><span class="cx"> // m_rowPositions include gutters so we need to substract them to get the actual end position for a given
</span><span class="cx"> // row (this does not have to be done for the last track as there are no more m_rowPositions after it)
</span><span class="lines">@@ -1878,8 +1863,8 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderGrid::rowAxisOffsetForChild(const RenderBox& child) const
</span><span class="cx"> {
</span><del>- const GridCoordinate& coordinate = cachedGridCoordinate(child);
- unsigned childStartLine = coordinate.columns.resolvedInitialPosition.toInt();
</del><ins>+ const GridSpan& columnsSpan = cachedGridSpan(child, ForColumns);
+ unsigned childStartLine = columnsSpan.resolvedInitialPosition.toInt();
</ins><span class="cx"> LayoutUnit startOfColumn = m_columnPositions[childStartLine];
</span><span class="cx"> LayoutUnit startPosition = startOfColumn + marginStartForChild(child);
</span><span class="cx"> if (hasAutoMarginsInRowAxis(child))
</span><span class="lines">@@ -1890,7 +1875,7 @@
</span><span class="cx"> return startPosition;
</span><span class="cx"> case GridAxisEnd:
</span><span class="cx"> case GridAxisCenter: {
</span><del>- unsigned childEndLine = coordinate.columns.resolvedFinalPosition.next().toInt();
</del><ins>+ unsigned childEndLine = columnsSpan.resolvedFinalPosition.next().toInt();
</ins><span class="cx"> LayoutUnit endOfColumn = m_columnPositions[childEndLine];
</span><span class="cx"> // m_columnPositions include gutters so we need to substract them to get the actual end position for a given
</span><span class="cx"> // column (this does not have to be done for the last track as there are no more m_columnPositions after it)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (192155 => 192156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h 2015-11-09 14:15:21 UTC (rev 192155)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2015-11-09 14:46:49 UTC (rev 192156)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> LayoutUnit currentItemSizeForTrackSizeComputationPhase(TrackSizeComputationPhase, RenderBox&, GridTrackSizingDirection, Vector<GridTrack>& columnTracks);
</span><span class="cx">
</span><span class="cx"> typedef struct GridItemsSpanGroupRange GridItemsSpanGroupRange;
</span><del>- void resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection, const GridCoordinate&, RenderBox& gridItem, GridTrack&, Vector<GridTrack>& columnTracks);
</del><ins>+ void resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSizingDirection, const GridSpan&, RenderBox& gridItem, GridTrack&, Vector<GridTrack>& columnTracks);
</ins><span class="cx"> template <TrackSizeComputationPhase> void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&, const GridItemsSpanGroupRange&);
</span><span class="cx"> template <TrackSizeComputationPhase> void distributeSpaceToTracks(Vector<GridTrack*>&, const Vector<GridTrack*>* growBeyondGrowthLimitsTracks, LayoutUnit& availableLogicalSpace);
</span><span class="cx">
</span><span class="lines">@@ -140,7 +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><del>- GridCoordinate cachedGridCoordinate(const RenderBox&) const;
</del><ins>+ GridSpan cachedGridSpan(const RenderBox&, GridTrackSizingDirection) const;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> LayoutUnit gridAreaBreadthForChild(const RenderBox& child, GridTrackSizingDirection, const Vector<GridTrack>&) const;
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx">
</span><span class="cx"> bool gridWasPopulated() const { return !m_grid.isEmpty() && !m_grid[0].isEmpty(); }
</span><span class="cx">
</span><del>- bool spanningItemCrossesFlexibleSizedTracks(const GridCoordinate&, GridTrackSizingDirection) const;
</del><ins>+ bool spanningItemCrossesFlexibleSizedTracks(const GridSpan&, GridTrackSizingDirection) const;
</ins><span class="cx">
</span><span class="cx"> unsigned gridColumnCount() const
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>