Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(891)

Unified Diff: third_party/WebKit/Source/core/layout/LayoutGrid.cpp

Issue 1608943003: [css-grid] Fix positioned items in grids with implicit tracks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test as we need explicit lines Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/LayoutGrid.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
index 2d8d7a891753d3c712db29a97e85353919170759..1044f1d2ab5fc9a592c3f325b2daa8e29e35eabc 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
@@ -1502,15 +1502,16 @@ void LayoutGrid::offsetAndBreadthForPositionedChild(const LayoutBox& child, Grid
GridPosition startPosition = isForColumns ? child.style()->gridColumnStart() : child.style()->gridRowStart();
GridPosition endPosition = isForColumns ? child.style()->gridColumnEnd() : child.style()->gridRowEnd();
- int lastExplicitLine = isForColumns ? gridColumnCount() : gridRowCount();
+ int firstExplicitLine = smallestStart;
+ int lastExplicitLine = (isForColumns ? GridResolvedPosition::explicitGridColumnCount(styleRef()) : GridResolvedPosition::explicitGridRowCount(styleRef())) + smallestStart;
bool startIsAuto = startPosition.isAuto()
|| (startPosition.isNamedGridArea() && !GridResolvedPosition::isValidNamedLineOrArea(startPosition.namedGridLine(), styleRef(), GridResolvedPosition::initialPositionSide(direction)))
- || (resolvedInitialPosition < 0)
+ || (resolvedInitialPosition < firstExplicitLine)
|| (resolvedInitialPosition > lastExplicitLine);
bool endIsAuto = endPosition.isAuto()
|| (endPosition.isNamedGridArea() && !GridResolvedPosition::isValidNamedLineOrArea(endPosition.namedGridLine(), styleRef(), GridResolvedPosition::finalPositionSide(direction)))
- || (resolvedFinalPosition < 0)
+ || (resolvedFinalPosition < firstExplicitLine)
|| (resolvedFinalPosition > lastExplicitLine);
size_t initialPosition = startIsAuto ? 0 : resolvedInitialPosition;
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-positioned-items-within-grid-implicit-track.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698