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

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

Issue 2080643002: [css-grid] Implement repeat(auto-fit) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Collapse empty tracks (do not drop them) Created 4 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: third_party/WebKit/Source/core/layout/LayoutGrid.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.h b/third_party/WebKit/Source/core/layout/LayoutGrid.h
index 2b7f531231f44fba6c4270a07ab86968c9e71a77..d7a9e515d8d038a3d826573a5f4e651b1cf14881 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.h
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h
@@ -59,6 +59,8 @@ public:
void dirtyGrid();
+ Vector<LayoutUnit> trackSizesForComputedStyle(GridTrackSizingDirection) const;
+
const Vector<LayoutUnit>& columnPositions() const
{
ASSERT(!m_gridIsDirty);
@@ -71,13 +73,6 @@ public:
return m_rowPositions;
}
- LayoutUnit guttersSize(GridTrackSizingDirection, size_t span) const;
-
- LayoutUnit offsetBetweenTracks(GridTrackSizingDirection direction) const
- {
- return direction == ForColumns ? m_offsetBetweenColumns : m_offsetBetweenRows;
- }
-
typedef Vector<LayoutBox*, 1> GridCell;
const GridCell& gridCell(int row, int column) const
{
@@ -131,6 +126,11 @@ private:
size_t computeAutoRepeatTracksCount(GridTrackSizingDirection) const;
+ typedef HashSet<size_t, DefaultHash<size_t>::Hash, WTF::UnsignedWithZeroKeyHashTraits<size_t>> TrackIndexSet;
+ std::unique_ptr<TrackIndexSet> computeEmptyTracksForAutoRepeat(GridTrackSizingDirection) const;
+
+ bool isEmptyAutoRepeatTrack(GridTrackSizingDirection, size_t lineNumber) const;
+
void placeItemsOnGrid();
void populateExplicitGridAndOrderIterator();
std::unique_ptr<GridArea> createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(const LayoutBox&, GridTrackSizingDirection, const GridSpan& specifiedPositions) const;
@@ -158,7 +158,6 @@ private:
template <TrackSizeComputationPhase> void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirection, GridSizingData&, const GridItemsSpanGroupRange&);
template <TrackSizeComputationPhase> void distributeSpaceToTracks(Vector<GridTrack*>&, const Vector<GridTrack*>* growBeyondGrowthLimitsTracks, GridSizingData&, LayoutUnit& availableLogicalSpace);
- typedef HashSet<size_t, DefaultHash<size_t>::Hash, WTF::UnsignedWithZeroKeyHashTraits<size_t>> TrackIndexSet;
double computeFlexFactorUnitSize(const Vector<GridTrack>&, GridTrackSizingDirection, double flexFactorSum, LayoutUnit& leftOverSpace, const Vector<size_t, 8>& flexibleTracksIndexes, std::unique_ptr<TrackIndexSet> tracksToTreatAsInflexible = nullptr) const;
double findFlexFactorUnitSize(const Vector<GridTrack>&, const GridSpan&, GridTrackSizingDirection, LayoutUnit leftOverSpace) const;
@@ -200,6 +199,9 @@ private:
bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, GridSizingData&);
#endif
+ LayoutUnit gridGapForDirection(GridTrackSizingDirection) const;
+ LayoutUnit guttersSize(GridTrackSizingDirection, size_t startLine, size_t span) const;
+
size_t gridItemSpan(const LayoutBox&, GridTrackSizingDirection);
bool spanningItemCrossesFlexibleSizedTracks(const GridSpan&, GridTrackSizingDirection, SizingOperation) const;
@@ -231,6 +233,9 @@ private:
size_t m_autoRepeatRows { 0 };
bool m_hasAnyOrthogonalChild;
+
+ std::unique_ptr<TrackIndexSet> m_autoRepeatEmptyColumns { nullptr };
+ std::unique_ptr<TrackIndexSet> m_autoRepeatEmptyRows { nullptr };
};
DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid());

Powered by Google App Engine
This is Rietveld 408576698