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

Unified Diff: Source/core/rendering/RenderGrid.cpp

Issue 146773002: [CSS Grid Layout] Rename grid-definition-{columns|rows} to match the new syntax (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed renaming issues with some tests. Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/UseCounter.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderGrid.cpp
diff --git a/Source/core/rendering/RenderGrid.cpp b/Source/core/rendering/RenderGrid.cpp
index df992aecfbf0d1aed805aef07512e2ef63b9f324..e5f2e11fe974c9be408d69bfdc7022623bae776f 100644
--- a/Source/core/rendering/RenderGrid.cpp
+++ b/Source/core/rendering/RenderGrid.cpp
@@ -238,8 +238,8 @@ void RenderGrid::styleDidChange(StyleDifference diff, const RenderStyle* oldStyl
bool RenderGrid::explicitGridDidResize(const RenderStyle* oldStyle) const
{
- return oldStyle->gridDefinitionColumns().size() != style()->gridDefinitionColumns().size()
- || oldStyle->gridDefinitionRows().size() != style()->gridDefinitionRows().size();
+ return oldStyle->gridTemplateColumns().size() != style()->gridTemplateColumns().size()
+ || oldStyle->gridTemplateRows().size() != style()->gridTemplateRows().size();
}
bool RenderGrid::namedGridLinesDefinitionDidChange(const RenderStyle* oldStyle) const
@@ -528,7 +528,7 @@ double RenderGrid::computeNormalizedFractionBreadth(Vector<GridTrack>& tracks, c
const GridTrackSize& RenderGrid::gridTrackSize(GridTrackSizingDirection direction, size_t i) const
{
- const Vector<GridTrackSize>& trackStyles = (direction == ForColumns) ? style()->gridDefinitionColumns() : style()->gridDefinitionRows();
+ const Vector<GridTrackSize>& trackStyles = (direction == ForColumns) ? style()->gridTemplateColumns() : style()->gridTemplateRows();
if (i >= trackStyles.size())
return (direction == ForColumns) ? style()->gridAutoColumns() : style()->gridAutoRows();
@@ -547,12 +547,12 @@ const GridTrackSize& RenderGrid::gridTrackSize(GridTrackSizingDirection directio
size_t RenderGrid::explicitGridColumnCount() const
{
- return style()->gridDefinitionColumns().size();
+ return style()->gridTemplateColumns().size();
}
size_t RenderGrid::explicitGridRowCount() const
{
- return style()->gridDefinitionRows().size();
+ return style()->gridTemplateRows().size();
}
size_t RenderGrid::explicitGridSizeForSide(GridPositionSide side) const
@@ -772,8 +772,8 @@ void RenderGrid::placeItemsOnGrid()
insertItemIntoGrid(child, GridCoordinate(*rowPositions, *columnPositions));
}
- ASSERT(gridRowCount() >= style()->gridDefinitionRows().size());
- ASSERT(gridColumnCount() >= style()->gridDefinitionColumns().size());
+ ASSERT(gridRowCount() >= style()->gridTemplateRows().size());
+ ASSERT(gridColumnCount() >= style()->gridTemplateColumns().size());
if (autoFlow == AutoFlowNone) {
// If we did collect some grid items, they won't be placed thus never laid out.
« no previous file with comments | « Source/core/frame/UseCounter.cpp ('k') | Source/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698