third_party/WebKit/Source/core/layout/LayoutGrid.h - Issue 1778853002: [css-grid] Fix height computation for items with intrinsic aspect ratios

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: Patch for landing 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

« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css-grid-layout/resources/blue-100x50.png ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.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 150 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
161 GridArea cachedGridArea(const LayoutBox&) const;	161 GridArea cachedGridArea(const LayoutBox&) const;

162 GridSpan cachedGridSpan(const LayoutBox&, GridTrackSizingDirection) const;	162 GridSpan cachedGridSpan(const LayoutBox&, GridTrackSizingDirection) const;

163	163

164 LayoutUnit gridAreaBreadthForChild(const LayoutBox& child, GridTrackSizingDi rection, const Vector<GridTrack>&) const;	164 LayoutUnit gridAreaBreadthForChild(const LayoutBox& child, GridTrackSizingDi rection, const Vector<GridTrack>&) const;

165 LayoutUnit gridAreaBreadthForChildIncludingAlignmentOffsets(const LayoutBox& , GridTrackSizingDirection, const GridSizingData&) const;	165 LayoutUnit gridAreaBreadthForChildIncludingAlignmentOffsets(const LayoutBox& , GridTrackSizingDirection, const GridSizingData&) const;

166	166

167 void applyStretchAlignmentToTracksIfNeeded(GridTrackSizingDirection, GridSiz ingData&);	167 void applyStretchAlignmentToTracksIfNeeded(GridTrackSizingDirection, GridSiz ingData&);

168	168

169 void paintChildren(const PaintInfo&, const LayoutPoint&) const override;	169 void paintChildren(const PaintInfo&, const LayoutPoint&) const override;

170	170

171 bool needToStretchChildLogicalHeight(const LayoutBox&) const;

172 LayoutUnit childIntrinsicHeight(const LayoutBox&) const;

173 LayoutUnit childIntrinsicWidth(const LayoutBox&) const;

174 LayoutUnit intrinsicLogicalHeightForChild(const LayoutBox&) const;

175 LayoutUnit marginLogicalHeightForChild(const LayoutBox&) const;	171 LayoutUnit marginLogicalHeightForChild(const LayoutBox&) const;

176 LayoutUnit computeMarginLogicalHeightForChild(const LayoutBox&) const;	172 LayoutUnit computeMarginLogicalHeightForChild(const LayoutBox&) const;

177 LayoutUnit availableAlignmentSpaceForChildBeforeStretching(LayoutUnit gridAr eaBreadthForChild, const LayoutBox&) const;	173 LayoutUnit availableAlignmentSpaceForChildBeforeStretching(LayoutUnit gridAr eaBreadthForChild, const LayoutBox&) const;

178 void applyStretchAlignmentToChildIfNeeded(LayoutBox&);	174 void applyStretchAlignmentToChildIfNeeded(LayoutBox&);

179 bool hasAutoMarginsInColumnAxis(const LayoutBox&) const;	175 bool hasAutoMarginsInColumnAxis(const LayoutBox&) const;

180 bool hasAutoMarginsInRowAxis(const LayoutBox&) const;	176 bool hasAutoMarginsInRowAxis(const LayoutBox&) const;

181 void updateAutoMarginsInColumnAxisIfNeeded(LayoutBox&);	177 void updateAutoMarginsInColumnAxisIfNeeded(LayoutBox&);

182 void updateAutoMarginsInRowAxisIfNeeded(LayoutBox&);	178 void updateAutoMarginsInRowAxisIfNeeded(LayoutBox&);

183	179

184 #if ENABLE(ASSERT)	180 #if ENABLE(ASSERT)

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
216	212

217 int m_smallestRowStart;	213 int m_smallestRowStart;

218 int m_smallestColumnStart;	214 int m_smallestColumnStart;

219 };	215 };

220	216

221 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid());	217 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutGrid, isLayoutGrid());

222	218

223 } // namespace blink	219 } // namespace blink

224	220

225 #endif // LayoutGrid_h	221 #endif // LayoutGrid_h

OLD	NEW