[CSS Grid Layout] Redefining grids inside media queries does not work

Source/core/css/resolver/StyleBuilderConverter.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 463 matching lines @@
         ++currentNamedGridLine;
         trackSizes.append(convertGridTrackSize(state, currValue));
     }
 
     // The parser should have rejected any <track-list> without any <track-size> as
     // this is not conformant to the syntax.
     ASSERT(!trackSizes.isEmpty());
     return true;
 }
 
+void StyleBuilderConverter::convertOrderedNamedGridLinesMapToNamedGridLinesMap(const OrderedNamedGridLines& orderedNamedGridLines, NamedGridLinesMap& namedGridLines)
+{
+    ASSERT(namedGridLines.size() == 0);
+
+    if (orderedNamedGridLines.size() == 0)
+        return;
+
+    for (auto& orderedNamedGridLine : orderedNamedGridLines) {
+        for (auto& lineName : orderedNamedGridLine.value) {
+            NamedGridLinesMap::AddResult startResult = namedGridLines.add(lineName, Vector<size_t>());
+            startResult.storedValue->value.append(orderedNamedGridLine.key);
+        }
+    }
+
+    for (auto& namedGridLine : namedGridLines) {
+        Vector<size_t> gridLineIndexes = namedGridLine.value;
+        std::sort(gridLineIndexes.begin(), gridLineIndexes.end());

[Julien - ping for review, 2014/11/10 16:03:33]

We may know do 2 sorting as we generate the implicit named grid lines. We should
find a way to do only one per application. This is a nit though as I don't think
we will end up with a lot of tracks.

+    }
+}
+
 void StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap& namedGridAreas, NamedGridLinesMap& namedGridLines, GridTrackSizingDirection direction)
 {
     for (const auto& namedGridAreaEntry : namedGridAreas) {
         GridSpan areaSpan = direction == ForRows ? namedGridAreaEntry.value.rows : namedGridAreaEntry.value.columns;
         {
             NamedGridLinesMap::AddResult startResult = namedGridLines.add(namedGridAreaEntry.key + "-start", Vector<size_t>());
             startResult.storedValue->value.append(areaSpan.resolvedInitialPosition.toInt());
             std::sort(startResult.storedValue->value.begin(), startResult.storedValue->value.end());
         }
         {
@@ skipping 325 matching lines @@
     CSSPrimitiveValue* primitiveValueZ = toCSSPrimitiveValue(list->item(2));
 
     return TransformOrigin(
         convertOriginLength<CSSValueLeft, CSSValueRight>(state, primitiveValueX),
         convertOriginLength<CSSValueTop, CSSValueBottom>(state, primitiveValueY),
         StyleBuilderConverter::convertComputedLength<float>(state, primitiveValueZ)
     );
 }
 
 } // namespace blink