Fix handling of 'inherit' and 'initial' for grid lines

Source/core/css/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 1750 matching lines @@
         // not be scaled again.
         if (e->hasTagName(SVGNames::foreignObjectTag))
             style->setEffectiveZoom(RenderStyle::initialZoom());
     }
 #endif
 }
 
 void StyleResolver::adjustGridItemPosition(RenderStyle* style) const
 {
     // If opposing grid-placement properties both specify a grid span, they both compute to ‘auto’.
-    if (style->gridItemStart().isSpan() && style->gridItemEnd().isSpan()) {
-        style->setGridItemStart(GridPosition());
-        style->setGridItemEnd(GridPosition());
+    if (style->gridStart().isSpan() && style->gridEnd().isSpan()) {
+        style->setGridStart(GridPosition());
+        style->setGridEnd(GridPosition());
     }
 
-    if (style->gridItemBefore().isSpan() && style->gridItemAfter().isSpan()) {
-        style->setGridItemBefore(GridPosition());
-        style->setGridItemAfter(GridPosition());
+    if (style->gridBefore().isSpan() && style->gridAfter().isSpan()) {
+        style->setGridBefore(GridPosition());
+        style->setGridAfter(GridPosition());
     }
 }
 
 bool StyleResolver::checkRegionStyle(Element* regionElement)
 {
     // FIXME (BUG 72472): We don't add @-webkit-region rules of scoped style sheets for the moment,
     // so all region rules are global by default. Verify whether that can stand or needs changing.
 
     unsigned rulesSize = m_ruleSets.authorStyle()->m_regionSelectorsAndRuleSets.size();
     for (unsigned i = 0; i < rulesSize; ++i) {
@@ skipping 1201 matching lines @@
     }
     case CSSPropertyWebkitGridRows: {
         Vector<GridTrackSize> trackSizes;
         if (!createGridTrackList(value, trackSizes, state))
             return;
         state.style()->setGridRows(trackSizes);
         return;
     }
 
     case CSSPropertyWebkitGridStart: {
+        HANDLE_INHERIT_AND_INITIAL(gridStart, GridStart);
         GridPosition startPosition;
         if (!createGridPosition(value, startPosition))
             return;
-        state.style()->setGridItemStart(startPosition);
+        state.style()->setGridStart(startPosition);
         return;
     }
     case CSSPropertyWebkitGridEnd: {
+        HANDLE_INHERIT_AND_INITIAL(gridEnd, GridEnd);
         GridPosition endPosition;
         if (!createGridPosition(value, endPosition))
             return;
-        state.style()->setGridItemEnd(endPosition);
+        state.style()->setGridEnd(endPosition);
         return;
     }
 
     case CSSPropertyWebkitGridBefore: {
+        HANDLE_INHERIT_AND_INITIAL(gridBefore, GridBefore);
         GridPosition beforePosition;
         if (!createGridPosition(value, beforePosition))
             return;
-        state.style()->setGridItemBefore(beforePosition);
+        state.style()->setGridBefore(beforePosition);
         return;
     }
     case CSSPropertyWebkitGridAfter: {
+        HANDLE_INHERIT_AND_INITIAL(gridAfter, GridAfter);
         GridPosition afterPosition;
         if (!createGridPosition(value, afterPosition))
             return;
-        state.style()->setGridItemAfter(afterPosition);
+        state.style()->setGridAfter(afterPosition);
         return;
     }
 
     // These properties are aliased and StyleBuilder already applied the property on the prefixed version.
     case CSSPropertyTransitionDelay:
     case CSSPropertyTransitionDuration:
     case CSSPropertyTransitionProperty:
     case CSSPropertyTransitionTimingFunction:
         return;
     // These properties are implemented in the StyleBuilder lookup table.
@@ skipping 1607 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