Add CSS support for font-variation-settings

third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp
index ea11e3526f21a4320e15ec975c802d068fef120d..24da6892c3a0b9b62a186d07c05577175b692ce9 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp
@@ -32,6 +32,7 @@
 #include "core/css/CSSCustomIdentValue.h"
 #include "core/css/CSSFontFamilyValue.h"
 #include "core/css/CSSFontFeatureValue.h"
+#include "core/css/CSSFontVariationValue.h"
 #include "core/css/CSSFunctionValue.h"
 #include "core/css/CSSGridAutoRepeatValue.h"
 #include "core/css/CSSGridLineNamesValue.h"
@@ -250,6 +251,24 @@ StyleBuilderConverter::convertFontFeatureSettings(StyleResolverState& state,
   return settings;
 }
 
+PassRefPtr<FontVariationSettings>
+StyleBuilderConverter::convertFontVariationSettings(StyleResolverState& state,
+                                                    const CSSValue& value) {
+  if (value.isIdentifierValue() &&
+      toCSSIdentifierValue(value).getValueID() == CSSValueNormal)
+    return FontBuilder::initialVariationSettings();
+
+  const CSSValueList& list = toCSSValueList(value);
+  RefPtr<FontVariationSettings> settings = FontVariationSettings::create();
+  int len = list.length();
+  for (int i = 0; i < len; ++i) {
+    const CSSFontVariationValue& feature =
+        toCSSFontVariationValue(list.item(i));
+    settings->append(FontVariationAxis(feature.tag(), feature.value()));
+  }
+  return settings;
+}
+
 static float computeFontSize(StyleResolverState& state,
                              const CSSPrimitiveValue& primitiveValue,
                              const FontDescription::Size& parentSize) {