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

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

Issue 554293003: [CSS Grid Layout] RenderGrid methods should take RenderBox references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 6 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
« no previous file with comments | « no previous file | Source/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 const Vector<LayoutUnit>& columnPositions() const { return m_columnPositions ; } 52 const Vector<LayoutUnit>& columnPositions() const { return m_columnPositions ; }
53 const Vector<LayoutUnit>& rowPositions() const { return m_rowPositions; } 53 const Vector<LayoutUnit>& rowPositions() const { return m_rowPositions; }
54 54
55 private: 55 private:
56 virtual bool isRenderGrid() const OVERRIDE { return true; } 56 virtual bool isRenderGrid() const OVERRIDE { return true; }
57 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE; 57 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE;
58 virtual void computePreferredLogicalWidths() OVERRIDE; 58 virtual void computePreferredLogicalWidths() OVERRIDE;
59 59
60 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE; 60 virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;
61 void addChildToIndexesMap(RenderBox*); 61 void addChildToIndexesMap(RenderBox&);
62 virtual void removeChild(RenderObject*) OVERRIDE; 62 virtual void removeChild(RenderObject*) OVERRIDE;
63 63
64 virtual void styleDidChange(StyleDifference, const RenderStyle*) OVERRIDE; 64 virtual void styleDidChange(StyleDifference, const RenderStyle*) OVERRIDE;
65 65
66 bool explicitGridDidResize(const RenderStyle*) const; 66 bool explicitGridDidResize(const RenderStyle*) const;
67 bool namedGridLinesDefinitionDidChange(const RenderStyle*) const; 67 bool namedGridLinesDefinitionDidChange(const RenderStyle*) const;
68 68
69 class GridIterator; 69 class GridIterator;
70 struct GridSizingData; 70 struct GridSizingData;
71 bool gridElementIsShrinkToFit(); 71 bool gridElementIsShrinkToFit();
72 void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData &); 72 void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData &);
73 void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData &, LayoutUnit& availableLogicalSpace); 73 void computeUsedBreadthOfGridTracks(GridTrackSizingDirection, GridSizingData &, LayoutUnit& availableLogicalSpace);
74 LayoutUnit computeUsedBreadthOfMinLength(GridTrackSizingDirection, const Gri dLength&) const; 74 LayoutUnit computeUsedBreadthOfMinLength(GridTrackSizingDirection, const Gri dLength&) const;
75 LayoutUnit computeUsedBreadthOfMaxLength(GridTrackSizingDirection, const Gri dLength&, LayoutUnit usedBreadth) const; 75 LayoutUnit computeUsedBreadthOfMaxLength(GridTrackSizingDirection, const Gri dLength&, LayoutUnit usedBreadth) const;
76 LayoutUnit computeUsedBreadthOfSpecifiedLength(GridTrackSizingDirection, con st Length&) const; 76 LayoutUnit computeUsedBreadthOfSpecifiedLength(GridTrackSizingDirection, con st Length&) const;
77 void resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection, GridS izingData&, LayoutUnit& availableLogicalSpace); 77 void resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection, GridS izingData&, LayoutUnit& availableLogicalSpace);
78 78
79 void ensureGridSize(size_t maximumRowIndex, size_t maximumColumnIndex); 79 void ensureGridSize(size_t maximumRowIndex, size_t maximumColumnIndex);
80 void insertItemIntoGrid(RenderBox*, const GridCoordinate&); 80 void insertItemIntoGrid(RenderBox&, const GridCoordinate&);
81 void placeItemsOnGrid(); 81 void placeItemsOnGrid();
82 void populateExplicitGridAndOrderIterator(); 82 void populateExplicitGridAndOrderIterator();
83 PassOwnPtr<GridCoordinate> createEmptyGridAreaAtSpecifiedPositionsOutsideGri d(const RenderBox*, GridTrackSizingDirection, const GridSpan& specifiedPositions ) const; 83 PassOwnPtr<GridCoordinate> createEmptyGridAreaAtSpecifiedPositionsOutsideGri d(const RenderBox&, GridTrackSizingDirection, const GridSpan& specifiedPositions ) const;
84 void placeSpecifiedMajorAxisItemsOnGrid(const Vector<RenderBox*>&); 84 void placeSpecifiedMajorAxisItemsOnGrid(const Vector<RenderBox*>&);
85 void placeAutoMajorAxisItemsOnGrid(const Vector<RenderBox*>&); 85 void placeAutoMajorAxisItemsOnGrid(const Vector<RenderBox*>&);
86 void placeAutoMajorAxisItemOnGrid(RenderBox*, std::pair<size_t, size_t>& aut oPlacementCursor); 86 void placeAutoMajorAxisItemOnGrid(RenderBox&, std::pair<size_t, size_t>& aut oPlacementCursor);
87 GridTrackSizingDirection autoPlacementMajorAxisDirection() const; 87 GridTrackSizingDirection autoPlacementMajorAxisDirection() const;
88 GridTrackSizingDirection autoPlacementMinorAxisDirection() const; 88 GridTrackSizingDirection autoPlacementMinorAxisDirection() const;
89 89
90 void layoutGridItems(); 90 void layoutGridItems();
91 void populateGridPositions(const GridSizingData&); 91 void populateGridPositions(const GridSizingData&);
92 92
93 typedef LayoutUnit (RenderGrid::* SizingFunction)(RenderBox*, GridTrackSizin gDirection, Vector<GridTrack>&); 93 typedef LayoutUnit (RenderGrid::* SizingFunction)(RenderBox&, GridTrackSizin gDirection, Vector<GridTrack>&);
94 typedef LayoutUnit (GridTrack::* AccumulatorGetter)() const; 94 typedef LayoutUnit (GridTrack::* AccumulatorGetter)() const;
95 typedef void (GridTrack::* AccumulatorGrowFunction)(LayoutUnit); 95 typedef void (GridTrack::* AccumulatorGrowFunction)(LayoutUnit);
96 typedef bool (GridTrackSize::* FilterFunction)() const; 96 typedef bool (GridTrackSize::* FilterFunction)() const;
97 void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirectio n, GridSizingData&, RenderBox*, FilterFunction, SizingFunction, AccumulatorGette r, AccumulatorGrowFunction); 97 void resolveContentBasedTrackSizingFunctionsForItems(GridTrackSizingDirectio n, GridSizingData&, RenderBox&, FilterFunction, SizingFunction, AccumulatorGette r, AccumulatorGrowFunction);
98 void distributeSpaceToTracks(Vector<GridTrack*>&, Vector<GridTrack*>* tracks ForGrowthAboveMaxBreadth, AccumulatorGetter, AccumulatorGrowFunction, GridSizing Data&, LayoutUnit& availableLogicalSpace); 98 void distributeSpaceToTracks(Vector<GridTrack*>&, Vector<GridTrack*>* tracks ForGrowthAboveMaxBreadth, AccumulatorGetter, AccumulatorGrowFunction, GridSizing Data&, LayoutUnit& availableLogicalSpace);
99 99
100 double computeNormalizedFractionBreadth(Vector<GridTrack>&, const GridSpan& tracksSpan, GridTrackSizingDirection, LayoutUnit availableLogicalSpace) const; 100 double computeNormalizedFractionBreadth(Vector<GridTrack>&, const GridSpan& tracksSpan, GridTrackSizingDirection, LayoutUnit availableLogicalSpace) const;
101 101
102 const GridTrackSize& gridTrackSize(GridTrackSizingDirection, size_t) const; 102 const GridTrackSize& gridTrackSize(GridTrackSizingDirection, size_t) const;
103 103
104 LayoutUnit logicalHeightForChild(RenderBox*, Vector<GridTrack>&); 104 LayoutUnit logicalHeightForChild(RenderBox&, Vector<GridTrack>&);
105 LayoutUnit minContentForChild(RenderBox*, GridTrackSizingDirection, Vector<G ridTrack>& columnTracks); 105 LayoutUnit minContentForChild(RenderBox&, GridTrackSizingDirection, Vector<G ridTrack>& columnTracks);
106 LayoutUnit maxContentForChild(RenderBox*, GridTrackSizingDirection, Vector<G ridTrack>& columnTracks); 106 LayoutUnit maxContentForChild(RenderBox&, GridTrackSizingDirection, Vector<G ridTrack>& columnTracks);
107 LayoutUnit startOfColumnForChild(const RenderBox* child) const; 107 LayoutUnit startOfColumnForChild(const RenderBox& child) const;
108 LayoutUnit endOfColumnForChild(const RenderBox* child) const; 108 LayoutUnit endOfColumnForChild(const RenderBox& child) const;
109 LayoutUnit columnPositionAlignedWithGridContainerStart(const RenderBox*) con st; 109 LayoutUnit columnPositionAlignedWithGridContainerStart(const RenderBox&) con st;
110 LayoutUnit columnPositionAlignedWithGridContainerEnd(const RenderBox*) const ; 110 LayoutUnit columnPositionAlignedWithGridContainerEnd(const RenderBox&) const ;
111 LayoutUnit centeredColumnPositionForChild(const RenderBox*) const; 111 LayoutUnit centeredColumnPositionForChild(const RenderBox&) const;
112 LayoutUnit columnPositionForChild(const RenderBox*) const; 112 LayoutUnit columnPositionForChild(const RenderBox&) const;
113 LayoutUnit startOfRowForChild(const RenderBox* child) const; 113 LayoutUnit startOfRowForChild(const RenderBox& child) const;
114 LayoutUnit endOfRowForChild(const RenderBox* child) const; 114 LayoutUnit endOfRowForChild(const RenderBox& child) const;
115 LayoutUnit centeredRowPositionForChild(const RenderBox*) const; 115 LayoutUnit centeredRowPositionForChild(const RenderBox&) const;
116 LayoutUnit rowPositionForChild(const RenderBox*) const; 116 LayoutUnit rowPositionForChild(const RenderBox&) const;
117 LayoutPoint findChildLogicalPosition(const RenderBox*) const; 117 LayoutPoint findChildLogicalPosition(const RenderBox&) const;
118 GridCoordinate cachedGridCoordinate(const RenderBox*) const; 118 GridCoordinate cachedGridCoordinate(const RenderBox&) const;
119 119
120 LayoutUnit gridAreaBreadthForChild(const RenderBox* child, GridTrackSizingDi rection, const Vector<GridTrack>&) const; 120 LayoutUnit gridAreaBreadthForChild(const RenderBox& child, GridTrackSizingDi rection, const Vector<GridTrack>&) const;
121 121
122 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE; 122 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE;
123 123
124 bool gridIsDirty() const { return m_gridIsDirty; } 124 bool gridIsDirty() const { return m_gridIsDirty; }
125 125
126 #if ENABLE(ASSERT) 126 #if ENABLE(ASSERT)
127 bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, const Vecto r<GridTrack>&); 127 bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, const Vecto r<GridTrack>&);
128 #endif 128 #endif
129 129
130 size_t gridItemSpan(const RenderBox*, GridTrackSizingDirection); 130 size_t gridItemSpan(const RenderBox&, GridTrackSizingDirection);
131 131
132 size_t gridColumnCount() const 132 size_t gridColumnCount() const
133 { 133 {
134 ASSERT(!gridIsDirty()); 134 ASSERT(!gridIsDirty());
135 return m_grid[0].size(); 135 return m_grid[0].size();
136 } 136 }
137 size_t gridRowCount() const 137 size_t gridRowCount() const
138 { 138 {
139 ASSERT(!gridIsDirty()); 139 ASSERT(!gridIsDirty());
140 return m_grid.size(); 140 return m_grid.size();
141 } 141 }
142 142
143 typedef Vector<RenderBox*, 1> GridCell; 143 typedef Vector<RenderBox*, 1> GridCell;
144 typedef Vector<Vector<GridCell> > GridRepresentation; 144 typedef Vector<Vector<GridCell> > GridRepresentation;
145 GridRepresentation m_grid; 145 GridRepresentation m_grid;
146 bool m_gridIsDirty; 146 bool m_gridIsDirty;
147 Vector<LayoutUnit> m_rowPositions; 147 Vector<LayoutUnit> m_rowPositions;
148 Vector<LayoutUnit> m_columnPositions; 148 Vector<LayoutUnit> m_columnPositions;
149 HashMap<const RenderBox*, GridCoordinate> m_gridItemCoordinate; 149 HashMap<const RenderBox*, GridCoordinate> m_gridItemCoordinate;
150 OrderIterator m_orderIterator; 150 OrderIterator m_orderIterator;
151 Vector<RenderBox*> m_gridItemsOverflowingGridArea; 151 Vector<RenderBox*> m_gridItemsOverflowingGridArea;
152 HashMap<const RenderBox*, size_t> m_gridItemsIndexesMap; 152 HashMap<const RenderBox*, size_t> m_gridItemsIndexesMap;
153 }; 153 };
154 154
155 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderGrid, isRenderGrid()); 155 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderGrid, isRenderGrid());
156 156
157 } // namespace blink 157 } // namespace blink
158 158
159 #endif // RenderGrid_h 159 #endif // RenderGrid_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698