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

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

Issue 2333583002: [css-grid] Update intrinsic size for the extra sizing alg iteration. (Closed)
Patch Set: Created 4 years, 3 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
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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 void placeSpecifiedMajorAxisItemsOnGrid(const Vector<LayoutBox*>&); 139 void placeSpecifiedMajorAxisItemsOnGrid(const Vector<LayoutBox*>&);
140 void placeAutoMajorAxisItemsOnGrid(const Vector<LayoutBox*>&); 140 void placeAutoMajorAxisItemsOnGrid(const Vector<LayoutBox*>&);
141 void placeAutoMajorAxisItemOnGrid(LayoutBox&, std::pair<size_t, size_t>& aut oPlacementCursor); 141 void placeAutoMajorAxisItemOnGrid(LayoutBox&, std::pair<size_t, size_t>& aut oPlacementCursor);
142 GridTrackSizingDirection autoPlacementMajorAxisDirection() const; 142 GridTrackSizingDirection autoPlacementMajorAxisDirection() const;
143 GridTrackSizingDirection autoPlacementMinorAxisDirection() const; 143 GridTrackSizingDirection autoPlacementMinorAxisDirection() const;
144 144
145 void computeIntrinsicLogicalHeight(GridSizingData&); 145 void computeIntrinsicLogicalHeight(GridSizingData&);
146 LayoutUnit computeTrackBasedLogicalHeight(const GridSizingData&) const; 146 LayoutUnit computeTrackBasedLogicalHeight(const GridSizingData&) const;
147 void computeTrackSizesForDirection(GridTrackSizingDirection, GridSizingData& , LayoutUnit freeSpace); 147 void computeTrackSizesForDirection(GridTrackSizingDirection, GridSizingData& , LayoutUnit freeSpace);
148 148
149 void repeatTracksSizingIfNeeded(GridSizingData&, LayoutUnit availableSpaceFo rColumns, LayoutUnit availableSpaceForRows); 149 void resolveSizeOfGridRows(GridSizingData&);
150 void repeatTracksSizingIfNeeded(GridSizingData&);
150 151
151 void layoutGridItems(GridSizingData&); 152 void layoutGridItems(GridSizingData&);
152 void prepareChildForPositionedLayout(LayoutBox&); 153 void prepareChildForPositionedLayout(LayoutBox&);
153 void layoutPositionedObjects(bool relayoutChildren, PositionedLayoutBehavior = DefaultLayout); 154 void layoutPositionedObjects(bool relayoutChildren, PositionedLayoutBehavior = DefaultLayout);
154 void offsetAndBreadthForPositionedChild(const LayoutBox&, GridTrackSizingDir ection, LayoutUnit& offset, LayoutUnit& breadth); 155 void offsetAndBreadthForPositionedChild(const LayoutBox&, GridTrackSizingDir ection, LayoutUnit& offset, LayoutUnit& breadth);
155 void populateGridPositionsForDirection(GridSizingData&, GridTrackSizingDirec tion); 156 void populateGridPositionsForDirection(GridSizingData&, GridTrackSizingDirec tion);
156 157
157 typedef struct GridItemsSpanGroupRange GridItemsSpanGroupRange; 158 typedef struct GridItemsSpanGroupRange GridItemsSpanGroupRange;
158 LayoutUnit currentItemSizeForTrackSizeComputationPhase(TrackSizeComputationP hase, LayoutBox&, GridTrackSizingDirection, GridSizingData&) const; 159 LayoutUnit currentItemSizeForTrackSizeComputationPhase(TrackSizeComputationP hase, LayoutBox&, GridTrackSizingDirection, GridSizingData&) const;
159 void resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSiz ingDirection, const GridSpan&, LayoutBox& gridItem, GridTrack&, GridSizingData&) const; 160 void resolveContentBasedTrackSizingFunctionsForNonSpanningItems(GridTrackSiz ingDirection, const GridSpan&, LayoutBox& gridItem, GridTrack&, GridSizingData&) const;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 235
235 LayoutUnit m_minContentHeight { -1 }; 236 LayoutUnit m_minContentHeight { -1 };
236 LayoutUnit m_maxContentHeight { -1 }; 237 LayoutUnit m_maxContentHeight { -1 };
237 238
238 int m_smallestRowStart; 239 int m_smallestRowStart;
239 int m_smallestColumnStart; 240 int m_smallestColumnStart;
240 241
241 size_t m_autoRepeatColumns { 0 }; 242 size_t m_autoRepeatColumns { 0 };
242 size_t m_autoRepeatRows { 0 }; 243 size_t m_autoRepeatRows { 0 };
243 244
244 bool m_hasAnyOrthogonalChild; 245 Vector<LayoutBox*> m_orthogonalChilds;
mstensho (USE GERRIT) 2016/09/20 21:30:29 childs -> children
245 246
246 std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyColumns { nullptr }; 247 std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyColumns { nullptr };
247 std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyRows { nullptr }; 248 std::unique_ptr<OrderedTrackIndexSet> m_autoRepeatEmptyRows { nullptr };
248 }; 249 };
249 250
250 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid()); 251 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid());
251 252
252 } // namespace blink 253 } // namespace blink
253 254
254 #endif // LayoutGrid_h 255 #endif // LayoutGrid_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698