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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 return m_grid.size(); | 195 return m_grid.size(); |
196 } | 196 } |
197 | 197 |
198 bool hasDefiniteLogicalSize(GridTrackSizingDirection) const; | 198 bool hasDefiniteLogicalSize(GridTrackSizingDirection) const; |
199 | 199 |
200 typedef Vector<Vector<GridCell>> GridRepresentation; | 200 typedef Vector<Vector<GridCell>> GridRepresentation; |
201 GridRepresentation m_grid; | 201 GridRepresentation m_grid; |
202 bool m_gridIsDirty; | 202 bool m_gridIsDirty; |
203 Vector<LayoutUnit> m_rowPositions; | 203 Vector<LayoutUnit> m_rowPositions; |
204 Vector<LayoutUnit> m_columnPositions; | 204 Vector<LayoutUnit> m_columnPositions; |
| 205 LayoutUnit m_offsetBetweenColumns; |
| 206 LayoutUnit m_offsetBetweenRows; |
205 HashMap<const LayoutBox*, GridArea> m_gridItemArea; | 207 HashMap<const LayoutBox*, GridArea> m_gridItemArea; |
206 OrderIterator m_orderIterator; | 208 OrderIterator m_orderIterator; |
207 Vector<LayoutBox*> m_gridItemsOverflowingGridArea; | 209 Vector<LayoutBox*> m_gridItemsOverflowingGridArea; |
208 HashMap<const LayoutBox*, size_t> m_gridItemsIndexesMap; | 210 HashMap<const LayoutBox*, size_t> m_gridItemsIndexesMap; |
209 | 211 |
210 LayoutUnit m_minContentHeight { -1 }; | 212 LayoutUnit m_minContentHeight { -1 }; |
211 LayoutUnit m_maxContentHeight { -1 }; | 213 LayoutUnit m_maxContentHeight { -1 }; |
212 | 214 |
213 int m_smallestRowStart; | 215 int m_smallestRowStart; |
214 int m_smallestColumnStart; | 216 int m_smallestColumnStart; |
215 }; | 217 }; |
216 | 218 |
217 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid()); | 219 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid()); |
218 | 220 |
219 } // namespace blink | 221 } // namespace blink |
220 | 222 |
221 #endif // LayoutGrid_h | 223 #endif // LayoutGrid_h |
OLD | NEW |