| Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| index ff6671f0c5c46c223bfe75481a19c5d20caab67d..30ba7ff08afdc5fba6435c593e048e388627720a 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| @@ -3259,11 +3259,8 @@ static CSSValue* consumeGridLine(CSSParserTokenRange& range)
|
| 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;
|
| @@ -3271,6 +3268,16 @@ static bool isGridTrackFixedSized(const CSSValue& value)
|
| 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());
|
|
|