Index: Source/core/rendering/RenderGrid.cpp |
diff --git a/Source/core/rendering/RenderGrid.cpp b/Source/core/rendering/RenderGrid.cpp |
index 52143edc58f62d17449814b43d03f7d0ad0677bd..9fae0b72b89dce997b48dcb29eef91cfbfd2347e 100644 |
--- a/Source/core/rendering/RenderGrid.cpp |
+++ b/Source/core/rendering/RenderGrid.cpp |
@@ -1229,6 +1229,9 @@ void RenderGrid::offsetAndBreadthForPositionedChild(const RenderBox& child, Grid |
GridResolvedPosition lastPosition = GridResolvedPosition((direction == ForColumns ? gridColumnCount() : gridRowCount()) - 1); |
GridResolvedPosition finalPosition = endIsAuto ? lastPosition : positions->resolvedFinalPosition; |
+ initialPosition = std::min<GridResolvedPosition>(initialPosition, lastPosition); |
+ finalPosition = std::min<GridResolvedPosition>(finalPosition, lastPosition); |
Julien - ping for review
2014/12/09 18:49:53
I think we need to put a comment as to why we do t
Manuel Rego
2014/12/10 08:41:57
Done.
|
+ |
LayoutUnit start = startIsAuto ? LayoutUnit(0) : (direction == ForColumns) ? m_columnPositions[initialPosition.toInt()] : m_rowPositions[initialPosition.toInt()]; |
LayoutUnit end = endIsAuto ? (direction == ForColumns) ? logicalWidth() : logicalHeight() : (direction == ForColumns) ? m_columnPositions[finalPosition.next().toInt()] : m_rowPositions[finalPosition.next().toInt()]; |