Index: Source/core/rendering/RenderGrid.cpp |
diff --git a/Source/core/rendering/RenderGrid.cpp b/Source/core/rendering/RenderGrid.cpp |
index 8dda784767969d0cb39c7a2208b537a678182900..79b46f2b2cc85a0287b5f48aaf89b8df419eea0d 100644 |
--- a/Source/core/rendering/RenderGrid.cpp |
+++ b/Source/core/rendering/RenderGrid.cpp |
@@ -978,15 +978,26 @@ PassOwnPtr<GridCoordinate> RenderGrid::createEmptyGridAreaAtSpecifiedPositionsOu |
void RenderGrid::placeSpecifiedMajorAxisItemsOnGrid(const Vector<RenderBox*>& autoGridItems) |
{ |
+ GridTrackSizingDirection direction = autoPlacementMajorAxisDirection(); |
+ bool isGridAutoFlowDense = style()->isGridAutoFlowAlgorithmDense(); |
+ |
+ Vector<size_t> minorAxisCursors; |
Julien - ping for review
2015/02/23 16:15:16
I would love a comment about this vector to explai
Manuel Rego
2015/02/23 22:22:00
I agree. But finally I'm changing the Vector for a
|
+ if (!isGridAutoFlowDense) |
+ minorAxisCursors.grow(direction == ForColumns ? gridColumnCount() : gridRowCount()); |
+ |
for (const auto& autoGridItem : autoGridItems) { |
OwnPtr<GridSpan> majorAxisPositions = GridResolvedPosition::resolveGridPositionsFromStyle(*style(), *autoGridItem, autoPlacementMajorAxisDirection()); |
GridSpan minorAxisPositions = GridResolvedPosition::resolveGridPositionsFromAutoPlacementPosition(*style(), *autoGridItem, autoPlacementMinorAxisDirection(), GridResolvedPosition(0)); |
- GridIterator iterator(m_grid, autoPlacementMajorAxisDirection(), majorAxisPositions->resolvedInitialPosition.toInt()); |
+ GridIterator iterator(m_grid, autoPlacementMajorAxisDirection(), majorAxisPositions->resolvedInitialPosition.toInt(), isGridAutoFlowDense ? 0 : minorAxisCursors[majorAxisPositions->resolvedInitialPosition.toInt()]); |
Julien - ping for review
2015/02/18 21:08:40
That's relying on the default value in minorAxisCu
Manuel Rego
2015/02/18 21:23:10
We can use minorAxisCursors.fill(0) before to make
Julien - ping for review
2015/02/23 16:15:16
minorAxisCursors.fill(0) makes the code more clear
|
+ |
OwnPtr<GridCoordinate> emptyGridArea = iterator.nextEmptyGridArea(majorAxisPositions->integerSpan(), minorAxisPositions.integerSpan()); |
if (!emptyGridArea) |
emptyGridArea = createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(*autoGridItem, autoPlacementMajorAxisDirection(), *majorAxisPositions); |
insertItemIntoGrid(*autoGridItem, *emptyGridArea); |
+ |
+ if (!isGridAutoFlowDense) |
+ minorAxisCursors[majorAxisPositions->resolvedInitialPosition.toInt()] = (direction == ForColumns) ? emptyGridArea->rows.resolvedInitialPosition.toInt() : emptyGridArea->columns.resolvedInitialPosition.toInt(); |
} |
} |