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

Unified Diff: Source/core/rendering/RenderGrid.cpp

Issue 48573002: [CSS Grid] Do not grow grid tracks when the growth factor has 0 length (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cachetypes
Patch Set: Created 7 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderGrid.cpp
diff --git a/Source/core/rendering/RenderGrid.cpp b/Source/core/rendering/RenderGrid.cpp
index 34d53829df9dd334440561c02d95303804da49bc..4692328710f567785e2d1a56a8d4ac5b687bbac7 100644
--- a/Source/core/rendering/RenderGrid.cpp
+++ b/Source/core/rendering/RenderGrid.cpp
@@ -618,10 +618,13 @@ void RenderGrid::distributeSpaceToTracks(Vector<GridTrack*>& tracks, Vector<Grid
GridTrack& track = *tracks[i];
LayoutUnit availableLogicalSpaceShare = availableLogicalSpace / (tracksSize - i);
LayoutUnit trackBreadth = (tracks[i]->*trackGetter)();
- LayoutUnit growthShare = std::max(LayoutUnit(), std::min(availableLogicalSpaceShare, track.m_maxBreadth - trackBreadth));
- // We should never shrink any grid track or else we can't guarantee we abide by our min-sizing function.
- sizingData.distributeTrackVector[i] = trackBreadth + growthShare;
- availableLogicalSpace -= growthShare;
+ LayoutUnit growthShare = std::min(availableLogicalSpaceShare, track.m_maxBreadth - trackBreadth);
+ sizingData.distributeTrackVector[i] = trackBreadth;
+ // We should never shrink any grid track or else we can't guarantee we abide by our min-sizing function.
Julien - ping for review 2013/11/05 16:16:43 Unneeded space
+ if (growthShare > 0) {
+ sizingData.distributeTrackVector[i] += growthShare;
+ availableLogicalSpace -= growthShare;
+ }
}
if (availableLogicalSpace > 0 && tracksForGrowthAboveMaxBreadth) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698