Source/core/rendering/RenderGrid.h - Issue 198703004: [CSS Grid Layout] Fix issues adding new items to grid

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

Issue 198703004: [CSS Grid Layout] Fix issues adding new items to grid (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@enable-css-grid-layout

Patch Set: Keep else, improve comment and change param in growGrid() Created 6 years, 9 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

« no previous file with comments | « LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update-expected.txt ('k') | Source/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 62 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
73 class GridIterator;	73 class GridIterator;

74 struct GridSizingData;	74 struct GridSizingData;

75 bool gridElementIsShrinkToFit();	75 bool gridElementIsShrinkToFit();

76 void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData &);	76 void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData &);

77 void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData &, LayoutUnit& availableLogicalSpace);	77 void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData &, LayoutUnit& availableLogicalSpace);

78 LayoutUnit computeUsedBreadthOfMinLength(GridTrackSizingDirection, const Gri dLength&) const;	78 LayoutUnit computeUsedBreadthOfMinLength(GridTrackSizingDirection, const Gri dLength&) const;

79 LayoutUnit computeUsedBreadthOfMaxLength(GridTrackSizingDirection, const Gri dLength&, LayoutUnit usedBreadth) const;	79 LayoutUnit computeUsedBreadthOfMaxLength(GridTrackSizingDirection, const Gri dLength&, LayoutUnit usedBreadth) const;

80 LayoutUnit computeUsedBreadthOfSpecifiedLength(GridTrackSizingDirection, con st Length&) const;	80 LayoutUnit computeUsedBreadthOfSpecifiedLength(GridTrackSizingDirection, con st Length&) const;

81 void resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection, GridS izingData&, LayoutUnit& availableLogicalSpace);	81 void resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection, GridS izingData&, LayoutUnit& availableLogicalSpace);

82	82

83 void growGrid(GridTrackSizingDirection);	83 void growGrid(GridTrackSizingDirection, size_t maximumPosition);

84 void insertItemIntoGrid(RenderBox*, size_t rowTrack, size_t columnTrack);	84 void insertItemIntoGrid(RenderBox*, size_t rowTrack, size_t columnTrack);

85 void insertItemIntoGrid(RenderBox*, const GridCoordinate&);	85 void insertItemIntoGrid(RenderBox*, const GridCoordinate&);

86 void placeItemsOnGrid();	86 void placeItemsOnGrid();

87 void populateExplicitGridAndOrderIterator();	87 void populateExplicitGridAndOrderIterator();

88 void placeSpecifiedMajorAxisItemsOnGrid(const Vector<RenderBox*>&);	88 void placeSpecifiedMajorAxisItemsOnGrid(const Vector<RenderBox*>&);

89 void placeAutoMajorAxisItemsOnGrid(const Vector<RenderBox*>&);	89 void placeAutoMajorAxisItemsOnGrid(const Vector<RenderBox*>&);

90 void placeAutoMajorAxisItemOnGrid(RenderBox*);	90 void placeAutoMajorAxisItemOnGrid(RenderBox*);

91 GridTrackSizingDirection autoPlacementMajorAxisDirection() const;	91 GridTrackSizingDirection autoPlacementMajorAxisDirection() const;

92 GridTrackSizingDirection autoPlacementMinorAxisDirection() const;	92 GridTrackSizingDirection autoPlacementMinorAxisDirection() const;

93	93

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
162 Vector<RenderBox*> m_gridItemsOverflowingGridArea;	162 Vector<RenderBox*> m_gridItemsOverflowingGridArea;

163	163

164 friend class GridCoordinateSorter;	164 friend class GridCoordinateSorter;

165 };	165 };

166	166

167 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderGrid, isRenderGrid());	167 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderGrid, isRenderGrid());

168	168

169 } // namespace WebCore	169 } // namespace WebCore

170	170

171 #endif // RenderGrid_h	171 #endif // RenderGrid_h

OLD	NEW