Source/core/rendering/RenderGrid.h - Issue 146833018: [CSS Grid Layout] Fix missing layout in flexible and content sized columns

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

Issue 146833018: [CSS Grid Layout] Fix missing layout in flexible and content sized columns (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Move check to RenderGrid::resolveContentBasedTrackSizingFunctions() Created 6 years, 10 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

« LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize.html ('K') | « LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize-expected.txt ('k') | Source/core/rendering/RenderGrid.cpp » ('j') | Source/core/rendering/RenderGrid.cpp » ('J')
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 114 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
125 GridSpan resolveGridPositionsFromAutoPlacementPosition(const RenderBox*, Gri dTrackSizingDirection, size_t) const;	125 GridSpan resolveGridPositionsFromAutoPlacementPosition(const RenderBox*, Gri dTrackSizingDirection, size_t) const;

126 PassOwnPtr<GridSpan> resolveGridPositionsFromStyle(const RenderBox*, GridTra ckSizingDirection) const;	126 PassOwnPtr<GridSpan> resolveGridPositionsFromStyle(const RenderBox*, GridTra ckSizingDirection) const;

127 size_t resolveNamedGridLinePositionFromStyle(const GridPosition&, GridPositi onSide) const;	127 size_t resolveNamedGridLinePositionFromStyle(const GridPosition&, GridPositi onSide) const;

128 size_t resolveGridPositionFromStyle(const GridPosition&, GridPositionSide) c onst;	128 size_t resolveGridPositionFromStyle(const GridPosition&, GridPositionSide) c onst;

129 PassOwnPtr<GridSpan> resolveGridPositionAgainstOppositePosition(size_t resol vedOppositePosition, const GridPosition&, GridPositionSide) const;	129 PassOwnPtr<GridSpan> resolveGridPositionAgainstOppositePosition(size_t resol vedOppositePosition, const GridPosition&, GridPositionSide) const;

130 PassOwnPtr<GridSpan> resolveNamedGridLinePositionAgainstOppositePosition(siz e_t resolvedOppositePosition, const GridPosition&, GridPositionSide) const;	130 PassOwnPtr<GridSpan> resolveNamedGridLinePositionAgainstOppositePosition(siz e_t resolvedOppositePosition, const GridPosition&, GridPositionSide) const;

131 PassOwnPtr<GridSpan> resolveBeforeStartNamedGridLinePositionAgainstOppositeP osition(size_t resolvedOppositePosition, const GridPosition&, const Vector<size_ t>&) const;	131 PassOwnPtr<GridSpan> resolveBeforeStartNamedGridLinePositionAgainstOppositeP osition(size_t resolvedOppositePosition, const GridPosition&, const Vector<size_ t>&) const;

132 PassOwnPtr<GridSpan> resolveAfterEndNamedGridLinePositionAgainstOppositePosi tion(size_t resolvedOppositePosition, const GridPosition&, const Vector<size_t>& ) const;	132 PassOwnPtr<GridSpan> resolveAfterEndNamedGridLinePositionAgainstOppositePosi tion(size_t resolvedOppositePosition, const GridPosition&, const Vector<size_t>& ) const;

133	133

134 LayoutUnit gridAreaBreadthForChild(const RenderBox* child, GridTrackSizingDi rection, const Vector<GridTrack>&) const;	134 LayoutUnit gridAreaBreadthForChild(const RenderBox* child, GridTrackSizingDi rection, const Vector<GridTrack>&) const;

	135 bool breathIsFlexOrContentSizedForChild(RenderBox*, GridTrackSizingDirection ) const;

135	136

136 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE;	137 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE;

137 void paintChildrenSlowCase(PaintInfo&, const LayoutPoint&);	138 void paintChildrenSlowCase(PaintInfo&, const LayoutPoint&);

138	139

139 bool gridIsDirty() const { return m_gridIsDirty; }	140 bool gridIsDirty() const { return m_gridIsDirty; }

140	141

141 #ifndef NDEBUG	142 #ifndef NDEBUG

142 bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, const Vecto r<GridTrack>&);	143 bool tracksAreWiderThanMinTrackBreadth(GridTrackSizingDirection, const Vecto r<GridTrack>&);

143 #endif	144 #endif

144	145

(...skipping 17 matching lines...) Expand all Loading...
162 HashMap<const RenderBox*, GridCoordinate> m_gridItemCoordinate;	163 HashMap<const RenderBox*, GridCoordinate> m_gridItemCoordinate;

163 OrderIterator m_orderIterator;	164 OrderIterator m_orderIterator;

164 bool m_gridItemOverflowGridArea;	165 bool m_gridItemOverflowGridArea;

165 };	166 };

166	167

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

168	169

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

170	171

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

OLD	NEW