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

Unified Diff: Source/core/layout/LayoutGrid.h

Issue 1228983003: [CSS Grid Layout] Do not stretch always grid items with auto width (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Avoid overflow, since width is auto. Created 5 years, 5 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
Index: Source/core/layout/LayoutGrid.h
diff --git a/Source/core/layout/LayoutGrid.h b/Source/core/layout/LayoutGrid.h
index 0a50e9c3763348c7ed68f6a273f16c398803aee3..1781b64f14edfdd8659c8d9b6b35d648b4c81d3c 100644
--- a/Source/core/layout/LayoutGrid.h
+++ b/Source/core/layout/LayoutGrid.h
@@ -154,7 +154,10 @@ private:
LayoutUnit gridAreaBreadthForChild(const LayoutBox& child, GridTrackSizingDirection, const Vector<GridTrack>&) const;
virtual void paintChildren(const PaintInfo&, const LayoutPoint&) override;
- bool allowedToStretchLogicalHeightForChild(const LayoutBox& child) const;
+ bool hasAutoSizeInColumnAxisForChild(const LayoutBox&) const;
+ bool hasAutoSizeInRowAxisForChild(const LayoutBox&) const;
+ bool allowedToStretchChildAlongColumnAxis(const LayoutBox&) const;
+ bool allowedToStretchChildAlongRowAxis(const LayoutBox&) const;
bool needToStretchChildLogicalHeight(const LayoutBox&) const;
LayoutUnit childIntrinsicHeight(const LayoutBox&) const;
LayoutUnit childIntrinsicWidth(const LayoutBox&) const;
@@ -162,7 +165,7 @@ private:
LayoutUnit marginLogicalHeightForChild(const LayoutBox&) const;
LayoutUnit computeMarginLogicalHeightForChild(const LayoutBox&) const;
LayoutUnit availableAlignmentSpaceForChildBeforeStretching(LayoutUnit gridAreaBreadthForChild, const LayoutBox&) const;
- void applyStretchAlignmentToChildIfNeeded(LayoutBox&, LayoutUnit gridAreaBreadthForChild);
+ void applyStretchAlignmentToChildIfNeeded(LayoutBox&);
#if ENABLE(ASSERT)
bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, const Vector<GridTrack>&);

Powered by Google App Engine
This is Rietveld 408576698