[CSS Grid Layout] Rename grid-definition-{columns|rows} to match the new syntax

Source/core/rendering/RenderGrid.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 220 matching lines @@
     // - auto-flow changes only impacts auto-placed children.
 
     if (explicitGridDidResize(oldStyle)
         || namedGridLinesDefinitionDidChange(oldStyle)
         || oldStyle->gridAutoFlow() != style()->gridAutoFlow())
         dirtyGrid();
 }
 
 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
 {
     return oldStyle->namedGridRowLines() != style()->namedGridRowLines()
         || oldStyle->namedGridColumnLines() != style()->namedGridColumnLines();
 }
 
 void RenderGrid::layoutBlock(bool relayoutChildren)
 {
@@ skipping 268 matching lines @@
         accumulatedFractions += track.m_flex;
         // This item was processed so we re-add its used breadth to the available space to accurately count the remaining space.
         availableLogicalSpaceIgnoringFractionTracks += track.m_track->m_usedBreadth;
     }
 
     return availableLogicalSpaceIgnoringFractionTracks / accumulatedFractions;
 }
 
 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();
 
     const GridTrackSize& trackSize = trackStyles[i];
     // If the logical width/height of the grid container is indefinite, percentage values are treated as <auto>.
     if (trackSize.isPercentage()) {
         Length logicalSize = direction == ForColumns ? style()->logicalWidth() : style()->logicalHeight();
         if (logicalSize.isIntrinsicOrAuto()) {
             DEFINE_STATIC_LOCAL(GridTrackSize, autoTrackSize, (Length(Auto)));
             return autoTrackSize;
         }
     }
 
     return trackSize;
 }
 
 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
 {
     return (side == ColumnStartSide || side == ColumnEndSide) ? explicitGridColumnCount() : explicitGridRowCount();
 }
 
 LayoutUnit RenderGrid::logicalContentHeightForChild(RenderBox* child, Vector<GridTrack>& columnTracks)
 {
     SubtreeLayoutScope layoutScope(child);
@@ skipping 199 matching lines @@
             GridSpan* majorAxisPositions = (autoPlacementMajorAxisDirection() == ForColumns) ? columnPositions.get() : rowPositions.get();
             if (!majorAxisPositions)
                 autoMajorAxisAutoGridItems.append(child);
             else
                 specifiedMajorAxisAutoGridItems.append(child);
             continue;
         }
         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.
         ASSERT(!autoMajorAxisAutoGridItems.size());
         ASSERT(!specifiedMajorAxisAutoGridItems.size());
         return;
     }
 
     placeSpecifiedMajorAxisItemsOnGrid(specifiedMajorAxisAutoGridItems);
     placeAutoMajorAxisItemsOnGrid(autoMajorAxisAutoGridItems);
@@ skipping 528 matching lines @@
     if (isOutOfFlowPositioned())
         return "RenderGrid (positioned)";
     if (isAnonymous())
         return "RenderGrid (generated)";
     if (isRelPositioned())
         return "RenderGrid (relative positioned)";
     return "RenderGrid";
 }
 
 } // namespace WebCore