[CSS Grid Layout] Add support to place items using named grid lines

Source/core/css/resolver/StyleBuilderCustom.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * 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.
@@ skipping 1031 matching lines @@
     return; \
 }
 
 #define HANDLE_SVG_INHERIT_AND_INITIAL(prop, Prop) \
 HANDLE_SVG_INHERIT(prop, Prop) \
 if (isInitial) { \
     state.style()->accessSVGStyle()->set##Prop(SVGRenderStyle::initial##Prop()); \
     return; \
 }
 
+static void createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap& namedGridAreas, NamedGridLinesMap& namedGridLines, GridTrackSizingDirection direction)
+{
+    NamedGridAreaMap::const_iterator end = namedGridAreas.end();
+    for (NamedGridAreaMap::const_iterator it = namedGridAreas.begin(); it != end; ++it) {
+        GridSpan areaSpan = direction == ForRows ? it->value.rows : it->value.columns;
+
+        NamedGridLinesMap::AddResult startResult = namedGridLines.add(it->key + "-start", Vector<size_t>());
+        startResult.storedValue->value.append(areaSpan.resolvedInitialPosition.toInt());
+        std::sort(startResult.storedValue->value.begin(), startResult.storedValue->value.end());
+
+        NamedGridLinesMap::AddResult endResult = namedGridLines.add(it->key + "-end", Vector<size_t>());
+        endResult.storedValue->value.append(areaSpan.resolvedFinalPosition.toInt() + 1);
+        std::sort(endResult.storedValue->value.begin(), endResult.storedValue->value.end());
+    }
+}
+
 static GridLength createGridTrackBreadth(CSSPrimitiveValue* primitiveValue, const StyleResolverState& state)
 {
     if (primitiveValue->getValueID() == CSSValueMinContent)
         return Length(MinContent);
 
     if (primitiveValue->getValueID() == CSSValueMaxContent)
         return Length(MaxContent);
 
     // Fractional unit.
     if (primitiveValue->isFlex())
@@ skipping 669 matching lines @@
             state.style()->setNamedGridColumnLines(RenderStyle::initialNamedGridColumnLines());
             state.style()->setOrderedNamedGridColumnLines(RenderStyle::initialOrderedNamedGridColumnLines());
             return;
         }
 
         Vector<GridTrackSize> trackSizes;
         NamedGridLinesMap namedGridLines;
         OrderedNamedGridLines orderedNamedGridLines;
         if (!createGridTrackList(value, trackSizes, namedGridLines, orderedNamedGridLines, state))
             return;
+
+        const NamedGridAreaMap& namedGridAreas = state.style()->namedGridArea();
+        if (!namedGridAreas.isEmpty())
+            createImplicitNamedGridLinesFromGridArea(namedGridAreas, namedGridLines, ForColumns);
+
         state.style()->setGridTemplateColumns(trackSizes);
         state.style()->setNamedGridColumnLines(namedGridLines);
         state.style()->setOrderedNamedGridColumnLines(orderedNamedGridLines);
         return;
     }
     case CSSPropertyGridTemplateRows: {
         if (isInherit) {
             state.style()->setGridTemplateRows(state.parentStyle()->gridTemplateRows());
             state.style()->setNamedGridRowLines(state.parentStyle()->namedGridRowLines());
             state.style()->setOrderedNamedGridRowLines(state.parentStyle()->orderedNamedGridRowLines());
             return;
         }
         if (isInitial) {
             state.style()->setGridTemplateRows(RenderStyle::initialGridTemplateRows());
             state.style()->setNamedGridRowLines(RenderStyle::initialNamedGridRowLines());
             state.style()->setOrderedNamedGridRowLines(RenderStyle::initialOrderedNamedGridRowLines());
             return;
         }
 
         Vector<GridTrackSize> trackSizes;
         NamedGridLinesMap namedGridLines;
         OrderedNamedGridLines orderedNamedGridLines;
         if (!createGridTrackList(value, trackSizes, namedGridLines, orderedNamedGridLines, state))
             return;
+
+        const NamedGridAreaMap& namedGridAreas = state.style()->namedGridArea();
+        if (!namedGridAreas.isEmpty())
+            createImplicitNamedGridLinesFromGridArea(namedGridAreas, namedGridLines, ForRows);
+
         state.style()->setGridTemplateRows(trackSizes);
         state.style()->setNamedGridRowLines(namedGridLines);
         state.style()->setOrderedNamedGridRowLines(orderedNamedGridLines);
         return;
     }
 
     case CSSPropertyGridColumnStart: {
         HANDLE_INHERIT_AND_INITIAL(gridColumnStart, GridColumnStart);
         GridPosition startPosition;
         if (!createGridPosition(value, startPosition))
@@ skipping 40 matching lines @@
             state.style()->setNamedGridAreaColumnCount(RenderStyle::initialNamedGridAreaCount());
             return;
         }
 
         if (value->isPrimitiveValue()) {
             ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone);
             return;
         }
 
         CSSGridTemplateAreasValue* gridTemplateAreasValue = toCSSGridTemplateAreasValue(value);
-        state.style()->setNamedGridArea(gridTemplateAreasValue->gridAreaMap());
+        const NamedGridAreaMap& newNamedGridAreas = gridTemplateAreasValue->gridAreaMap();
+
+        NamedGridLinesMap namedGridColumnLines = state.style()->namedGridColumnLines();
+        NamedGridLinesMap namedGridRowLines = state.style()->namedGridRowLines();

[Julien - ping for review, 2014/05/12 11:42:12]

You're right about RenderStyle returning a constant reference, we could expose a
mutableNamedGridColumnLines() or just do the copy.

I have a slight preference for the latter as it's more efficient and compact but
I won't push either way.

+        createImplicitNamedGridLinesFromGridArea(newNamedGridAreas, namedGridColumnLines, ForColumns);
+        createImplicitNamedGridLinesFromGridArea(newNamedGridAreas, namedGridRowLines, ForRows);
+        state.style()->setNamedGridColumnLines(namedGridColumnLines);
+        state.style()->setNamedGridRowLines(namedGridRowLines);
+
+        state.style()->setNamedGridArea(newNamedGridAreas);
         state.style()->setNamedGridAreaRowCount(gridTemplateAreasValue->rowCount());
         state.style()->setNamedGridAreaColumnCount(gridTemplateAreasValue->columnCount());
         return;
     }
 
     case CSSPropertyJustifySelf: {
         HANDLE_INHERIT_AND_INITIAL(justifySelf, JustifySelf);
         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
         if (Pair* pairValue = primitiveValue->getPairValue()) {
             state.style()->setJustifySelf(*pairValue->first());
@@ skipping 459 matching lines @@
         break;
     }
     case CSSPropertyEnableBackground:
         // Silently ignoring this property for now
         // http://bugs.webkit.org/show_bug.cgi?id=6022
         break;
     }
 }
 
 } // namespace WebCore