| Index: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| index 3ce7aed12b5ea4b503c6ba7cbac7eca337d4d8cf..acfd912694e90756d1dde3846be5c4622f80fb32 100644
|
| --- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| +++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
|
| @@ -39,6 +39,7 @@
|
| #include "core/css/CSSCustomPropertyDeclaration.h"
|
| #include "core/css/CSSFontFamilyValue.h"
|
| #include "core/css/CSSFontFeatureValue.h"
|
| +#include "core/css/CSSFontVariationValue.h"
|
| #include "core/css/CSSFunctionValue.h"
|
| #include "core/css/CSSGridLineNamesValue.h"
|
| #include "core/css/CSSGridTemplateAreasValue.h"
|
| @@ -2363,6 +2364,21 @@ const CSSValue* ComputedStyleCSSValueMapping::get(
|
| }
|
| return list;
|
| }
|
| + case CSSPropertyFontVariationSettings: {
|
| + DCHECK(RuntimeEnabledFeatures::cssVariableFontsEnabled());
|
| + const FontVariationSettings* variationSettings =
|
| + style.getFontDescription().variationSettings();
|
| + if (!variationSettings || !variationSettings->size())
|
| + return CSSIdentifierValue::create(CSSValueNormal);
|
| + CSSValueList* list = CSSValueList::createCommaSeparated();
|
| + for (unsigned i = 0; i < variationSettings->size(); ++i) {
|
| + const FontVariationAxis& variationAxis = variationSettings->at(i);
|
| + CSSFontVariationValue* variationValue = CSSFontVariationValue::create(
|
| + variationAxis.tag(), variationAxis.value());
|
| + list->append(*variationValue);
|
| + }
|
| + return list;
|
| + }
|
| case CSSPropertyGridAutoFlow: {
|
| CSSValueList* list = CSSValueList::createSpaceSeparated();
|
| switch (style.getGridAutoFlow()) {
|
|
|