[css-grid] Implement fit-content track size

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 2766 matching lines @@
         return false;
 
     return true;
 }
 
 static bool isGridTrackFixedSized(const CSSValue& value)
 {
     if (value.isPrimitiveValue())
         return isGridTrackFixedSized(toCSSPrimitiveValue(value));
 
+    if (value.isFunctionValue() && toCSSFunctionValue(value).functionType() == CSSValueFitContent)
+        return false;
+
     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[].
@@ skipping 113 matching lines @@
             return nullptr;
         CSSPrimitiveValue* maxTrackBreadth = consumeGridBreadth(args, cssParserMode);
         if (!maxTrackBreadth || !args.atEnd())
             return nullptr;
         range = rangeCopy;
         CSSFunctionValue* result = CSSFunctionValue::create(CSSValueMinmax);
         result->append(*minTrackBreadth);
         result->append(*maxTrackBreadth);
         return result;
     }
+    if (token.functionId() == CSSValueFitContent) {
+        CSSParserTokenRange rangeCopy = range;
+        CSSParserTokenRange args = consumeFunction(rangeCopy);
+        CSSPrimitiveValue* trackBreadth = consumeGridBreadth(args, cssParserMode);
+        if (!trackBreadth || trackBreadth->isFlex() || !args.atEnd())
+            return nullptr;
+        range = rangeCopy;
+        CSSFunctionValue* result = CSSFunctionValue::create(CSSValueFitContent);
+        result->append(*trackBreadth);
+        return result;

[Manuel Rego, 2016/08/31 07:24:29]

I'm wondering if it'd be nice to move this to a separated method,
as it's supposed that "fit-content()" will apply to any block in the future:
https://drafts.csswg.org/css-sizing-4/#valdef-width-fit-content-length-percen...

Of course this can be done later once that's implemented eventually.

[svillar, 2016/08/31 09:50:04]

That's a good idea. Actually using consumeGridBreadth is not a good idea because
that allows the usage of some other things apart from lengths or percentages.

+    }
     return consumeGridBreadth(range, cssParserMode);
 }
 
 // Appends to the passed in CSSGridLineNamesValue if any, otherwise creates a new one.
 static CSSGridLineNamesValue* consumeGridLineNames(CSSParserTokenRange& range, CSSGridLineNamesValue* lineNames = nullptr)
 {
     CSSParserTokenRange rangeCopy = range;
     if (rangeCopy.consumeIncludingWhitespace().type() != LeftBracketToken)
         return nullptr;
     if (!lineNames)
@@ skipping 1767 matching lines @@
     case CSSPropertyGridTemplate:
         return consumeGridTemplateShorthand(CSSPropertyGridTemplate, important);
     case CSSPropertyGrid:
         return consumeGridShorthand(important);
     default:
         return false;
     }
 }
 
 } // namespace blink