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

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

Issue 1778853002: [css-grid] Fix height computation for items with intrinsic aspect ratios (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 bool hasAutoMarginsInColumnAxis(const LayoutBox&) const; 179 bool hasAutoMarginsInColumnAxis(const LayoutBox&) const;
180 bool hasAutoMarginsInRowAxis(const LayoutBox&) const; 180 bool hasAutoMarginsInRowAxis(const LayoutBox&) const;
181 void updateAutoMarginsInColumnAxisIfNeeded(LayoutBox&); 181 void updateAutoMarginsInColumnAxisIfNeeded(LayoutBox&);
182 void updateAutoMarginsInRowAxisIfNeeded(LayoutBox&); 182 void updateAutoMarginsInRowAxisIfNeeded(LayoutBox&);
183 183
184 #if ENABLE(ASSERT) 184 #if ENABLE(ASSERT)
185 bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, GridSizingD ata&); 185 bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, GridSizingD ata&);
186 #endif 186 #endif
187 187
188 size_t gridItemSpan(const LayoutBox&, GridTrackSizingDirection); 188 size_t gridItemSpan(const LayoutBox&, GridTrackSizingDirection);
189 bool spanningItemCrossesFlexibleSizedTracks(const GridSpan&, GridTrackSizing Direction) const; 189 enum SpanMode { FlexibleOnly, ContentSizedAndFlexible };
Manuel Rego 2016/03/14 14:38:09 Maybe call it SpanTracksMode. Dunno really, but tr
svillar 2016/03/17 13:33:54 I wasn't able to find a good name. I can change it
190 bool itemSpansContentSizedOrFlexibleSizedTracks(const GridSpan&, GridTrackSi zingDirection, SpanMode) const;
190 191
191 size_t gridColumnCount() const 192 size_t gridColumnCount() const
192 { 193 {
193 ASSERT(!m_gridIsDirty); 194 ASSERT(!m_gridIsDirty);
194 return m_grid[0].size(); 195 return m_grid[0].size();
195 } 196 }
196 size_t gridRowCount() const 197 size_t gridRowCount() const
197 { 198 {
198 ASSERT(!m_gridIsDirty); 199 ASSERT(!m_gridIsDirty);
199 return m_grid.size(); 200 return m_grid.size();
(...skipping 16 matching lines...) Expand all
216 217
217 int m_smallestRowStart; 218 int m_smallestRowStart;
218 int m_smallestColumnStart; 219 int m_smallestColumnStart;
219 }; 220 };
220 221
221 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid()); 222 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid());
222 223
223 } // namespace blink 224 } // namespace blink
224 225
225 #endif // LayoutGrid_h 226 #endif // LayoutGrid_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698