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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutGrid.h

Issue 2521573002: Revert of [css-grid] Remove a duplicated auto repeat computation for intrinsic sizes (patchset #4 i… (Closed)
Patch Set: Created 4 years 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
OLDNEW
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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 LayoutUnit maxBreadth) const; 135 LayoutUnit maxBreadth) const;
136 LayoutUnit computeUsedBreadthOfMaxLength(const GridTrackSize&, 136 LayoutUnit computeUsedBreadthOfMaxLength(const GridTrackSize&,
137 LayoutUnit usedBreadth, 137 LayoutUnit usedBreadth,
138 LayoutUnit maxBreadth) const; 138 LayoutUnit maxBreadth) const;
139 void resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection, 139 void resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection,
140 GridSizingData&) const; 140 GridSizingData&) const;
141 141
142 void ensureGridSize(size_t maximumRowSize, size_t maximumColumnSize); 142 void ensureGridSize(size_t maximumRowSize, size_t maximumColumnSize);
143 void insertItemIntoGrid(LayoutBox&, const GridArea&); 143 void insertItemIntoGrid(LayoutBox&, const GridArea&);
144 144
145 void updateAutoRepeatTracksAndSetDirtyIfNeeded(SizingOperation);
146 size_t computeAutoRepeatTracksCount(GridTrackSizingDirection, 145 size_t computeAutoRepeatTracksCount(GridTrackSizingDirection,
147 SizingOperation) const; 146 SizingOperation) const;
148 147
149 typedef ListHashSet<size_t> OrderedTrackIndexSet; 148 typedef ListHashSet<size_t> OrderedTrackIndexSet;
150 std::unique_ptr<OrderedTrackIndexSet> computeEmptyTracksForAutoRepeat( 149 std::unique_ptr<OrderedTrackIndexSet> computeEmptyTracksForAutoRepeat(
151 GridTrackSizingDirection) const; 150 GridTrackSizingDirection) const;
152 151
153 bool hasAutoRepeatEmptyTracks(GridTrackSizingDirection) const; 152 bool hasAutoRepeatEmptyTracks(GridTrackSizingDirection) const;
154 bool isEmptyAutoRepeatTrack(GridTrackSizingDirection, 153 bool isEmptyAutoRepeatTrack(GridTrackSizingDirection,
155 size_t lineNumber) const; 154 size_t lineNumber) const;
156 155
157 void placeItemsOnGrid(); 156 void placeItemsOnGrid(SizingOperation);
158 void populateExplicitGridAndOrderIterator(); 157 void populateExplicitGridAndOrderIterator();
159 std::unique_ptr<GridArea> createEmptyGridAreaAtSpecifiedPositionsOutsideGrid( 158 std::unique_ptr<GridArea> createEmptyGridAreaAtSpecifiedPositionsOutsideGrid(
160 const LayoutBox&, 159 const LayoutBox&,
161 GridTrackSizingDirection, 160 GridTrackSizingDirection,
162 const GridSpan& specifiedPositions) const; 161 const GridSpan& specifiedPositions) const;
163 void placeSpecifiedMajorAxisItemsOnGrid(const Vector<LayoutBox*>&); 162 void placeSpecifiedMajorAxisItemsOnGrid(const Vector<LayoutBox*>&);
164 void placeAutoMajorAxisItemsOnGrid(const Vector<LayoutBox*>&); 163 void placeAutoMajorAxisItemsOnGrid(const Vector<LayoutBox*>&);
165 void placeAutoMajorAxisItemOnGrid( 164 void placeAutoMajorAxisItemOnGrid(
166 LayoutBox&, 165 LayoutBox&,
167 std::pair<size_t, size_t>& autoPlacementCursor); 166 std::pair<size_t, size_t>& autoPlacementCursor);
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyRows{nullptr}; 371 std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyRows{nullptr};
373 372
374 Optional<bool> m_hasDefiniteLogicalHeight; 373 Optional<bool> m_hasDefiniteLogicalHeight;
375 }; 374 };
376 375
377 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid()); 376 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid());
378 377
379 } // namespace blink 378 } // namespace blink
380 379
381 #endif // LayoutGrid_h 380 #endif // LayoutGrid_h
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698