[CSS Grid Layout] Rename grid-{rows|columns} to grid-definition-{rows|columns}

Source/core/css/resolver/StyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 2966 matching lines @@
         return;
     }
     case CSSPropertyGridAutoRows: {
         HANDLE_INHERIT_AND_INITIAL(gridAutoRows, GridAutoRows);
         GridTrackSize trackSize;
         if (!createGridTrackSize(value, trackSize, state))
             return;
         state.style()->setGridAutoRows(trackSize);
         return;
     }
-    case CSSPropertyGridColumns: {
+    case CSSPropertyGridDefinitionColumns: {
         if (isInherit) {
-            m_state.style()->setGridColumns(m_state.parentStyle()->gridColumns());
+            m_state.style()->setGridDefinitionColumns(m_state.parentStyle()->gridDefinitionColumns());
             m_state.style()->setNamedGridColumnLines(m_state.parentStyle()->namedGridColumnLines());
             return;
         }
         if (isInitial) {
-            m_state.style()->setGridColumns(RenderStyle::initialGridColumns());
+            m_state.style()->setGridDefinitionColumns(RenderStyle::initialGridDefinitionColumns());
             m_state.style()->setNamedGridColumnLines(RenderStyle::initialNamedGridColumnLines());
             return;
         }
 
         Vector<GridTrackSize> trackSizes;
         NamedGridLinesMap namedGridLines;
         if (!createGridTrackList(value, trackSizes, namedGridLines, state))
             return;
-        state.style()->setGridColumns(trackSizes);
+        state.style()->setGridDefinitionColumns(trackSizes);
         state.style()->setNamedGridColumnLines(namedGridLines);
         return;
     }
-    case CSSPropertyGridRows: {
+    case CSSPropertyGridDefinitionRows: {
         if (isInherit) {
-            m_state.style()->setGridRows(m_state.parentStyle()->gridRows());
+            m_state.style()->setGridDefinitionRows(m_state.parentStyle()->gridDefinitionRows());
             m_state.style()->setNamedGridRowLines(m_state.parentStyle()->namedGridRowLines());
             return;
         }
         if (isInitial) {
-            m_state.style()->setGridRows(RenderStyle::initialGridRows());
+            m_state.style()->setGridDefinitionRows(RenderStyle::initialGridDefinitionRows());
             m_state.style()->setNamedGridRowLines(RenderStyle::initialNamedGridRowLines());
             return;
         }
 
         Vector<GridTrackSize> trackSizes;
         NamedGridLinesMap namedGridLines;
         if (!createGridTrackList(value, trackSizes, namedGridLines, state))
             return;
-        state.style()->setGridRows(trackSizes);
+        state.style()->setGridDefinitionRows(trackSizes);
         state.style()->setNamedGridRowLines(namedGridLines);
         return;
     }
 
     case CSSPropertyGridStart: {
         HANDLE_INHERIT_AND_INITIAL(gridStart, GridStart);
         GridPosition startPosition;
         if (!createGridPosition(value, startPosition))
             return;
         state.style()->setGridStart(startPosition);
@@ skipping 686 matching lines @@
     info.addMember(m_state, "state");
 
     // FIXME: move this to a place where it would be called only once?
     info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle");
     info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyle");
     info.addMember(CSSDefaultStyleSheets::defaultPrintStyle, "defaultPrintStyle");
     info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSourceStyle");
 }
 
 } // namespace WebCore