Implement 'grid-template' parsing

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 22 matching lines @@
 #include "HTMLNames.h"
 #include "RuntimeEnabledFeatures.h"
 #include "SVGNames.h"
 #include "XMLNames.h"
 #include "core/animation/AnimatableValue.h"
 #include "core/animation/Animation.h"
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/CSSCursorImageValue.h"
 #include "core/css/CSSDefaultStyleSheets.h"
 #include "core/css/CSSFontSelector.h"
+#include "core/css/CSSGridTemplateValue.h"
 #include "core/css/CSSImageSetValue.h"
 #include "core/css/CSSKeyframeRule.h"
 #include "core/css/CSSKeyframesRule.h"
 #include "core/css/CSSLineBoxContainValue.h"
 #include "core/css/CSSParser.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSReflectValue.h"
 #include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSSelector.h"
 #include "core/css/CSSSelectorList.h"
@@ skipping 2273 matching lines @@
 
     ASSERT(!it.hasMore());
     if (isSpanPosition)
         position.setSpanPosition(gridLineNumber, gridLineName);
     else
         position.setExplicitPosition(gridLineNumber, gridLineName);
 
     return true;
 }
 
+static void createGridTemplate(CSSValue* value, NamedGridAreaMap& namedGridArea, size_t& rowCount, size_t& columnCount)

[ojan, 2013/07/29 23:03:28]

I don't think this function adds value.

[Julien - ping for review, 2013/07/30 18:43:33]

ACK!

+{
+    if (value->isPrimitiveValue()) {
+        ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone);
+        return;
+    }
+
+    CSSGridTemplateValue* gridTemplateValue = toCSSGridTemplateValue(value);
+    namedGridArea = gridTemplateValue->gridAreaMap();
+    rowCount = gridTemplateValue->rowCount();
+    columnCount = gridTemplateValue->columnCount();

[esprehn, 2013/07/29 23:27:36]

This makes the code really confusing, can you just put the thing inline? :)

+}
+
 static bool hasVariableReference(CSSValue* value)
 {
     if (value->isPrimitiveValue()) {
         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
         return primitiveValue->hasVariableReference();
     }
 
     if (value->isCalculationValue())
         return static_cast<CSSCalcValue*>(value)->hasVariableReference();
 
@@ skipping 674 matching lines @@
     }
     case CSSPropertyGridRowEnd: {
         HANDLE_INHERIT_AND_INITIAL(gridRowEnd, GridRowEnd);
         GridPosition afterPosition;
         if (!createGridPosition(value, afterPosition))
             return;
         state.style()->setGridRowEnd(afterPosition);
         return;
     }
 
+    case CSSPropertyGridTemplate: {
+        if (isInherit) {
+            m_state.style()->setNamedGridArea(m_state.parentStyle()->namedGridArea());
+            m_state.style()->setNamedGridAreaRowCount(m_state.parentStyle()->namedGridAreaRowCount());
+            m_state.style()->setNamedGridAreaColumnCount(m_state.parentStyle()->namedGridAreaColumnCount());
+            return;
+        }
+        if (isInitial) {
+            m_state.style()->setNamedGridArea(RenderStyle::initialNamedGridArea());
+            m_state.style()->setNamedGridAreaRowCount(RenderStyle::initialNamedGridAreaCount());
+            m_state.style()->setNamedGridAreaColumnCount(RenderStyle::initialNamedGridAreaCount());
+            return;
+        }
+
+        size_t rowCount;
+        size_t columnCount;
+        NamedGridAreaMap namedGridArea;
+        createGridTemplate(value, namedGridArea, rowCount, columnCount);
+        m_state.style()->setNamedGridArea(namedGridArea);
+        m_state.style()->setNamedGridAreaRowCount(rowCount);
+        m_state.style()->setNamedGridAreaColumnCount(columnCount);
+        return;
+    }
+
     // These properties are aliased and DeprecatedStyleBuilder already applied the property on the prefixed version.
     case CSSPropertyTransitionDelay:
     case CSSPropertyTransitionDuration:
     case CSSPropertyTransitionProperty:
     case CSSPropertyTransitionTimingFunction:
         return;
     // These properties are implemented in the DeprecatedStyleBuilder lookup table or in the new StyleBuilder.
     case CSSPropertyBackgroundAttachment:
     case CSSPropertyBackgroundBlendMode:
     case CSSPropertyBackgroundClip:
@@ skipping 436 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