Index: Source/core/css/resolver/StyleBuilderCustom.cpp |
diff --git a/Source/core/css/resolver/StyleBuilderCustom.cpp b/Source/core/css/resolver/StyleBuilderCustom.cpp |
index 2b6271c4cec25b0ab1ddbb4174e4ee66068c339f..f0a2aa0eb00bcce5c48ce11ec48af4ee142df69e 100644 |
--- a/Source/core/css/resolver/StyleBuilderCustom.cpp |
+++ b/Source/core/css/resolver/StyleBuilderCustom.cpp |
@@ -49,6 +49,7 @@ |
#include "core/css/CSSFontValue.h" |
#include "core/css/CSSFunctionValue.h" |
#include "core/css/CSSGradientValue.h" |
+#include "core/css/CSSGridLineNamesValue.h" |
#include "core/css/CSSGridTemplateValue.h" |
#include "core/css/CSSImageSetValue.h" |
#include "core/css/CSSLineBoxContainValue.h" |
@@ -1053,16 +1054,16 @@ static bool createGridTrackList(CSSValue* value, Vector<GridTrackSize>& trackSiz |
size_t currentNamedGridLine = 0; |
for (CSSValueListIterator i = value; i.hasMore(); i.advance()) { |
CSSValue* currValue = i.value(); |
- if (currValue->isPrimitiveValue()) { |
- CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(currValue); |
- if (primitiveValue->isString()) { |
- String namedGridLine = primitiveValue->getStringValue(); |
+ if (currValue->isGridLineNamesValue()) { |
+ CSSGridLineNamesValue* lineNamesValue = toCSSGridLineNamesValue(currValue); |
+ for (CSSValueListIterator j = lineNamesValue; j.hasMore(); j.advance()) { |
+ String namedGridLine = toCSSPrimitiveValue(j.value())->getStringValue(); |
NamedGridLinesMap::AddResult result = namedGridLines.add(namedGridLine, Vector<size_t>()); |
result.iterator->value.append(currentNamedGridLine); |
OrderedNamedGridLines::AddResult orderedInsertionResult = orderedNamedGridLines.add(currentNamedGridLine, Vector<String>()); |
orderedInsertionResult.iterator->value.append(namedGridLine); |
- continue; |
} |
+ continue; |
} |
++currentNamedGridLine; |