[CSS Grid Layout] Rename grid placement properties

Source/core/css/resolver/StyleResolver.cpp

Index: Source/core/css/resolver/StyleResolver.cpp
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index 87e23ed306e135e387b2d810eef1cf2e700852d8..e3086d53a2978229e7630d2eb8cf43124fa95d9d 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -1713,14 +1713,14 @@ void StyleResolver::adjustRenderStyle(RenderStyle* style, RenderStyle* parentSty
 void StyleResolver::adjustGridItemPosition(RenderStyle* style) const
 {
     // If opposing grid-placement properties both specify a grid span, they both compute to ‘auto’.
-    if (style->gridStart().isSpan() && style->gridEnd().isSpan()) {
-        style->setGridStart(GridPosition());
-        style->setGridEnd(GridPosition());
+    if (style->gridColumnStart().isSpan() && style->gridColumnEnd().isSpan()) {
+        style->setGridColumnStart(GridPosition());
+        style->setGridColumnEnd(GridPosition());
     }
 
-    if (style->gridBefore().isSpan() && style->gridAfter().isSpan()) {
-        style->setGridBefore(GridPosition());
-        style->setGridAfter(GridPosition());
+    if (style->gridRowStart().isSpan() && style->gridRowEnd().isSpan()) {
+        style->setGridRowStart(GridPosition());
+        style->setGridRowEnd(GridPosition());
     }
 }
 
@@ -3025,37 +3025,37 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
         return;
     }
 
-    case CSSPropertyGridStart: {
-        HANDLE_INHERIT_AND_INITIAL(gridStart, GridStart);
+    case CSSPropertyGridColumnStart: {
+        HANDLE_INHERIT_AND_INITIAL(gridColumnStart, GridColumnStart);
         GridPosition startPosition;

[Julien - ping for review, 2013/06/25 17:14:37]

Would be nice to rename the position too as it should be columnStartPosition
now.

         if (!createGridPosition(value, startPosition))
             return;
-        state.style()->setGridStart(startPosition);
+        state.style()->setGridColumnStart(startPosition);
         return;
     }
-    case CSSPropertyGridEnd: {
-        HANDLE_INHERIT_AND_INITIAL(gridEnd, GridEnd);
+    case CSSPropertyGridColumnEnd: {
+        HANDLE_INHERIT_AND_INITIAL(gridColumnEnd, GridColumnEnd);
         GridPosition endPosition;

[Julien - ping for review, 2013/06/25 17:14:37]

Ditto.

         if (!createGridPosition(value, endPosition))
             return;
-        state.style()->setGridEnd(endPosition);
+        state.style()->setGridColumnEnd(endPosition);
         return;
     }
 
-    case CSSPropertyGridBefore: {
-        HANDLE_INHERIT_AND_INITIAL(gridBefore, GridBefore);
+    case CSSPropertyGridRowStart: {
+        HANDLE_INHERIT_AND_INITIAL(gridRowStart, GridRowStart);
         GridPosition beforePosition;

[Julien - ping for review, 2013/06/25 17:14:37]

Ditto.

         if (!createGridPosition(value, beforePosition))
             return;
-        state.style()->setGridBefore(beforePosition);
+        state.style()->setGridRowStart(beforePosition);
         return;
     }
-    case CSSPropertyGridAfter: {
-        HANDLE_INHERIT_AND_INITIAL(gridAfter, GridAfter);
+    case CSSPropertyGridRowEnd: {
+        HANDLE_INHERIT_AND_INITIAL(gridRowEnd, GridRowEnd);
         GridPosition afterPosition;

[Julien - ping for review, 2013/06/25 17:14:37]

Ditto.

         if (!createGridPosition(value, afterPosition))
             return;
-        state.style()->setGridAfter(afterPosition);
+        state.style()->setGridRowEnd(afterPosition);
         return;
     }