[CSS Grid Layout] Rename grid placement properties

Source/core/css/StylePropertyShorthand.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 375 matching lines @@
 const StylePropertyShorthand& webkitMarginCollapseShorthand()
 {
     static const CSSPropertyID marginCollapseProperties[] = { CSSPropertyWebkitMarginBeforeCollapse, CSSPropertyWebkitMarginAfterCollapse };
     DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitMarginCollapseLonghands, (CSSPropertyWebkitMarginCollapse, marginCollapseProperties, WTF_ARRAY_LENGTH(marginCollapseProperties)));
     return webkitMarginCollapseLonghands;
 }
 
 const StylePropertyShorthand& gridColumnShorthand()
 {
     static const CSSPropertyID gridColumnProperties[] = {
-        CSSPropertyGridStart,
-        CSSPropertyGridEnd
+        CSSPropertyGridColumnStart,
+        CSSPropertyGridColumnEnd
     };
     DEFINE_STATIC_LOCAL(StylePropertyShorthand, gridColumnLonghands, (CSSPropertyGridColumn, gridColumnProperties, WTF_ARRAY_LENGTH(gridColumnProperties)));
     return gridColumnLonghands;
 }
 
 const StylePropertyShorthand& gridRowShorthand()
 {
     static const CSSPropertyID gridRowProperties[] = {
-        CSSPropertyGridBefore,
-        CSSPropertyGridAfter
+        CSSPropertyGridRowStart,
+        CSSPropertyGridRowEnd
     };
     DEFINE_STATIC_LOCAL(StylePropertyShorthand, gridRowLonghands, (CSSPropertyGridRow, gridRowProperties, WTF_ARRAY_LENGTH(gridRowProperties)));
     return gridRowLonghands;
 }
 
 const StylePropertyShorthand& gridAreaShorthand()
 {
     static const CSSPropertyID gridAreaProperties[] = {
-        CSSPropertyGridStart,
-        CSSPropertyGridBefore,
-        CSSPropertyGridEnd,
-        CSSPropertyGridAfter
+        CSSPropertyGridColumnStart,
+        CSSPropertyGridRowStart,
+        CSSPropertyGridColumnEnd,
+        CSSPropertyGridRowEnd
     };
     DEFINE_STATIC_LOCAL(StylePropertyShorthand, gridAreaLonghands, (CSSPropertyGridArea, gridAreaProperties, WTF_ARRAY_LENGTH(gridAreaProperties)));
     return gridAreaLonghands;
 }
 
 const StylePropertyShorthand& webkitMarqueeShorthand()
 {
     static const CSSPropertyID marqueeProperties[] = {
         CSSPropertyWebkitMarqueeDirection,
         CSSPropertyWebkitMarqueeIncrement,
@@ skipping 429 matching lines @@
         map.set(CSSPropertyWebkitFlexBasis, flex);
 
         Vector<StylePropertyShorthand, 1> flexFlow;
         flexFlow.uncheckedAppend(webkitFlexFlowShorthand());
         map.set(CSSPropertyWebkitFlexDirection, flexFlow);
         map.set(CSSPropertyWebkitFlexWrap, flexFlow);
 
         Vector<StylePropertyShorthand, 2> grid;
         grid.uncheckedAppend(gridAreaShorthand());
         grid.uncheckedAppend(gridColumnShorthand());
-        map.set(CSSPropertyGridStart, grid);
-        map.set(CSSPropertyGridEnd, grid);
+        map.set(CSSPropertyGridColumnStart, grid);
+        map.set(CSSPropertyGridColumnEnd, grid);
 
         Vector<StylePropertyShorthand, 2> gridAfter;
         gridAfter.uncheckedAppend(gridAreaShorthand());
         gridAfter.uncheckedAppend(gridRowShorthand());
-        map.set(CSSPropertyGridBefore, gridAfter);
-        map.set(CSSPropertyGridAfter, gridAfter);
+        map.set(CSSPropertyGridRowStart, gridAfter);
+        map.set(CSSPropertyGridRowEnd, gridAfter);
 
         Vector<StylePropertyShorthand, 1> marginCollapse;
         marginCollapse.uncheckedAppend(webkitMarginCollapseShorthand());
         map.set(CSSPropertyWebkitMarginBeforeCollapse, marginCollapse);
         map.set(CSSPropertyWebkitMarginAfterCollapse, marginCollapse);
 
         Vector<StylePropertyShorthand, 1> marquee;
         marquee.uncheckedAppend(webkitMarqueeShorthand());
         map.set(CSSPropertyWebkitMarqueeDirection, marquee);
         map.set(CSSPropertyWebkitMarqueeIncrement, marquee);
@@ skipping 58 matching lines @@
 {
     for (unsigned i = 0; i < shorthands.size(); ++i) {
         if (shorthands.at(i).id() == shorthandID)
             return i;
     }
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 } // namespace WebCore