[css-grid] Update <fixed-size> syntax

third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/parser/CSSPropertyParser.h"
 
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSBasicShapeValues.h"
 #include "core/css/CSSBorderImage.h"
 #include "core/css/CSSContentDistributionValue.h"
@@ skipping 3241 matching lines @@
     if (spanValue)
         values->append(spanValue);
     if (numericValue)
         values->append(numericValue);
     if (gridLineName)
         values->append(gridLineName);
     ASSERT(values->length());
     return values;
 }
 
-static bool isGridTrackFixedSized(const CSSValue& value)
+static bool isGridTrackFixedSized(const CSSPrimitiveValue& primitiveValue)
 {
-    const CSSPrimitiveValue& primitiveValue = value.isPrimitiveValue()
-        ? toCSSPrimitiveValue(value)
-        : toCSSPrimitiveValue(*toCSSFunctionValue(value).item(0));
     CSSValueID valueID = primitiveValue.getValueID();
     if (valueID == CSSValueMinContent || valueID == CSSValueMaxContent || valueID == CSSValueAuto || primitiveValue.isFlex())
         return false;
 
     return true;
 }
 
+static bool isGridTrackFixedSized(const CSSValue& value)
+{
+    if (value.isPrimitiveValue())
+        return isGridTrackFixedSized(toCSSPrimitiveValue(value));
+
+    const CSSPrimitiveValue& minPrimitiveValue = toCSSPrimitiveValue(*toCSSFunctionValue(value).item(0));
+    const CSSPrimitiveValue& maxPrimitiveValue = toCSSPrimitiveValue(*toCSSFunctionValue(value).item(1));
+    return isGridTrackFixedSized(minPrimitiveValue) || isGridTrackFixedSized(maxPrimitiveValue);
+}
+
 static Vector<String> parseGridTemplateAreasColumnNames(const String& gridRowNames)
 {
     ASSERT(!gridRowNames.isEmpty());
     Vector<String> columnNames;
     // Using StringImpl to avoid checks and indirection in every call to String::operator[].
     StringImpl& text = *gridRowNames.impl();
 
     StringBuilder areaName;
     for (unsigned i = 0; i < text.length(); ++i) {
         if (isCSSSpace(text[i])) {
@@ skipping 1878 matching lines @@
     case CSSPropertyGridTemplate:
         return consumeGridTemplateShorthand(CSSPropertyGridTemplate, important);
     case CSSPropertyGrid:
         return consumeGridShorthand(important);
     default:
         return false;
     }
 }
 
 } // namespace blink