Source/core/rendering/RenderGrid.h - Issue 802243003: [CSS Grid Layout] Incorrect sizing of tracks with non-spanning items

Side by Side Diff: Source/core/rendering/RenderGrid.h

Issue 802243003: [CSS Grid Layout] Incorrect sizing of tracks with non-spanning items (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Patch for landing v3 Created 5 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 unified diff | Download patch

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Apple Inc. All rights reserved.	2 * Copyright (C) 2011 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 86 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97	97

98 void layoutGridItems();	98 void layoutGridItems();

99 void layoutPositionedObjects(bool relayoutChildren, PositionedLayoutBehavior = DefaultLayout);	99 void layoutPositionedObjects(bool relayoutChildren, PositionedLayoutBehavior = DefaultLayout);

100 void offsetAndBreadthForPositionedChild(const RenderBox&, GridTrackSizingDir ection, bool startIsAuto, bool endIsAuto, LayoutUnit& offset, LayoutUnit& breadt h);	100 void offsetAndBreadthForPositionedChild(const RenderBox&, GridTrackSizingDir ection, bool startIsAuto, bool endIsAuto, LayoutUnit& offset, LayoutUnit& breadt h);

101 void populateGridPositions(const GridSizingData&, LayoutUnit availableSpaceF orColumns, LayoutUnit availableSpaceForRows);	101 void populateGridPositions(const GridSizingData&, LayoutUnit availableSpaceF orColumns, LayoutUnit availableSpaceForRows);

102	102

103 typedef LayoutUnit (RenderGrid::* SizingFunction)(RenderBox&, GridTrackSizin gDirection, Vector<GridTrack>&);	103 typedef LayoutUnit (RenderGrid::* SizingFunction)(RenderBox&, GridTrackSizin gDirection, Vector<GridTrack>&);

104 typedef const LayoutUnit& (GridTrack::* AccumulatorGetter)() const;	104 typedef const LayoutUnit& (GridTrack::* AccumulatorGetter)() const;

105 typedef void (GridTrack::* AccumulatorGrowFunction)(LayoutUnit);	105 typedef void (GridTrack::* AccumulatorGrowFunction)(LayoutUnit);

106 typedef bool (GridTrackSize::* FilterFunction)() const;	106 typedef bool (GridTrackSize::* FilterFunction)() const;

	107 void resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSiz ingDirection, const GridCoordinate&, RenderBox& gridItem, GridTrack&, Vector<Gri dTrack>& columnTracks);

107 void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirectio n, GridSizingData&, GridItemWithSpan&, FilterFunction, SizingFunction, Accumulat orGetter, AccumulatorGrowFunction, FilterFunction growAboveMaxBreadthFilterFunct ion = nullptr);	108 void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirectio n, GridSizingData&, GridItemWithSpan&, FilterFunction, SizingFunction, Accumulat orGetter, AccumulatorGrowFunction, FilterFunction growAboveMaxBreadthFilterFunct ion = nullptr);

108 void distributeSpaceToTracks(Vector<GridTrack>&, Vector<size_t> tracksForG rowthAboveMaxBreadth, AccumulatorGetter, AccumulatorGrowFunction, GridSizingData &, LayoutUnit& availableLogicalSpace);	109 void distributeSpaceToTracks(Vector<GridTrack>&, Vector<size_t> tracksForG rowthAboveMaxBreadth, AccumulatorGetter, AccumulatorGrowFunction, GridSizingData &, LayoutUnit& availableLogicalSpace);

109	110

110 double computeNormalizedFractionBreadth(Vector<GridTrack>&, const GridSpan& tracksSpan, GridTrackSizingDirection, LayoutUnit availableLogicalSpace) const;	111 double computeNormalizedFractionBreadth(Vector<GridTrack>&, const GridSpan& tracksSpan, GridTrackSizingDirection, LayoutUnit availableLogicalSpace) const;

111	112

112 GridTrackSize gridTrackSize(GridTrackSizingDirection, size_t) const;	113 GridTrackSize gridTrackSize(GridTrackSizingDirection, size_t) const;

113	114

114 LayoutUnit logicalHeightForChild(RenderBox&, Vector<GridTrack>&);	115 LayoutUnit logicalHeightForChild(RenderBox&, Vector<GridTrack>&);

115 LayoutUnit minContentForChild(RenderBox&, GridTrackSizingDirection, Vector<G ridTrack>& columnTracks);	116 LayoutUnit minContentForChild(RenderBox&, GridTrackSizingDirection, Vector<G ridTrack>& columnTracks);

116 LayoutUnit maxContentForChild(RenderBox&, GridTrackSizingDirection, Vector<G ridTrack>& columnTracks);	117 LayoutUnit maxContentForChild(RenderBox&, GridTrackSizingDirection, Vector<G ridTrack>& columnTracks);

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
167 OrderIterator m_orderIterator;	168 OrderIterator m_orderIterator;

168 Vector<RenderBox*> m_gridItemsOverflowingGridArea;	169 Vector<RenderBox*> m_gridItemsOverflowingGridArea;

169 HashMap<const RenderBox*, size_t> m_gridItemsIndexesMap;	170 HashMap<const RenderBox*, size_t> m_gridItemsIndexesMap;

170 };	171 };

171	172

172 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderGrid, isRenderGrid());	173 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderGrid, isRenderGrid());

173	174

174 } // namespace blink	175 } // namespace blink

175	176

176 #endif // RenderGrid_h	177 #endif // RenderGrid_h

OLD	NEW