Index: Source/core/css/CSSComputedStyleDeclaration.cpp |
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp |
index c13bfc1b8ef18db4426959a414d9ba7affa7d958..b1cfe964e3839ef559fa8a7466105322479722f3 100644 |
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp |
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp |
@@ -1063,12 +1063,15 @@ static PassRefPtr<CSSValue> valueForGridPosition(const GridPosition& position) |
if (position.isAuto()) |
return cssValuePool().createIdentifierValue(CSSValueAuto); |
- if (position.isInteger()) |
- return cssValuePool().createValue(position.integerPosition(), CSSPrimitiveValue::CSS_NUMBER); |
- |
RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated(); |
- list->append(cssValuePool().createIdentifierValue(CSSValueSpan)); |
- list->append(cssValuePool().createValue(position.spanPosition(), CSSPrimitiveValue::CSS_NUMBER)); |
+ if (position.isSpan()) { |
+ list->append(cssValuePool().createIdentifierValue(CSSValueSpan)); |
+ list->append(cssValuePool().createValue(position.spanPosition(), CSSPrimitiveValue::CSS_NUMBER)); |
+ } else { |
+ list->append(cssValuePool().createValue(position.integerPosition(), CSSPrimitiveValue::CSS_NUMBER)); |
+ if (!position.namedGridLine().isNull()) |
+ list->append(cssValuePool().createValue(position.namedGridLine(), CSSPrimitiveValue::CSS_STRING)); |
+ } |
return list; |
} |
static PassRefPtr<CSSValue> createTransitionPropertyValue(const CSSAnimationData* animation) |