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

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

Issue 297483005: [CSS Grid Layout] Implementation of the align-self property in grid. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed build error. Created 6 years, 5 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 LayoutUnit logicalHeightForChild(RenderBox*, Vector<GridTrack>&); 105 LayoutUnit logicalHeightForChild(RenderBox*, Vector<GridTrack>&);
106 LayoutUnit minContentForChild(RenderBox*, GridTrackSizingDirection, Vector<G ridTrack>& columnTracks); 106 LayoutUnit minContentForChild(RenderBox*, GridTrackSizingDirection, Vector<G ridTrack>& columnTracks);
107 LayoutUnit maxContentForChild(RenderBox*, GridTrackSizingDirection, Vector<G ridTrack>& columnTracks); 107 LayoutUnit maxContentForChild(RenderBox*, GridTrackSizingDirection, Vector<G ridTrack>& columnTracks);
108 LayoutUnit startOfColumnForChild(const RenderBox* child) const; 108 LayoutUnit startOfColumnForChild(const RenderBox* child) const;
109 LayoutUnit endOfColumnForChild(const RenderBox* child) const; 109 LayoutUnit endOfColumnForChild(const RenderBox* child) const;
110 LayoutUnit columnPositionAlignedWithGridContainerStart(const RenderBox*) con st; 110 LayoutUnit columnPositionAlignedWithGridContainerStart(const RenderBox*) con st;
111 LayoutUnit columnPositionAlignedWithGridContainerEnd(const RenderBox*) const ; 111 LayoutUnit columnPositionAlignedWithGridContainerEnd(const RenderBox*) const ;
112 LayoutUnit centeredColumnPositionForChild(const RenderBox*) const; 112 LayoutUnit centeredColumnPositionForChild(const RenderBox*) const;
113 LayoutUnit columnPositionForChild(const RenderBox*) const; 113 LayoutUnit columnPositionForChild(const RenderBox*) const;
114 LayoutUnit startOfRowForChild(const RenderBox* child) const;
115 LayoutUnit endOfRowForChild(const RenderBox* child) const;
116 LayoutUnit centeredRowPositionForChild(const RenderBox*) const;
114 LayoutUnit rowPositionForChild(const RenderBox*) const; 117 LayoutUnit rowPositionForChild(const RenderBox*) const;
115 LayoutPoint findChildLogicalPosition(const RenderBox*) const; 118 LayoutPoint findChildLogicalPosition(const RenderBox*) const;
116 GridCoordinate cachedGridCoordinate(const RenderBox*) const; 119 GridCoordinate cachedGridCoordinate(const RenderBox*) const;
117 120
118 LayoutUnit gridAreaBreadthForChild(const RenderBox* child, GridTrackSizingDi rection, const Vector<GridTrack>&) const; 121 LayoutUnit gridAreaBreadthForChild(const RenderBox* child, GridTrackSizingDi rection, const Vector<GridTrack>&) const;
119 122
120 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE; 123 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE;
121 124
122 bool gridIsDirty() const { return m_gridIsDirty; } 125 bool gridIsDirty() const { return m_gridIsDirty; }
123 126
(...skipping 22 matching lines...) Expand all
146 OrderIterator m_orderIterator; 149 OrderIterator m_orderIterator;
147 Vector<RenderBox*> m_gridItemsOverflowingGridArea; 150 Vector<RenderBox*> m_gridItemsOverflowingGridArea;
148 HashMap<const RenderBox*, size_t> m_gridItemsIndexesMap; 151 HashMap<const RenderBox*, size_t> m_gridItemsIndexesMap;
149 }; 152 };
150 153
151 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderGrid, isRenderGrid()); 154 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderGrid, isRenderGrid());
152 155
153 } // namespace WebCore 156 } // namespace WebCore
154 157
155 #endif // RenderGrid_h 158 #endif // RenderGrid_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/css-grid-layout/grid-align-expected.txt ('k') | Source/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698