Add CSS support for font-variation-settings

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 14 matching lines @@
  */
 
 #include "core/css/resolver/StyleBuilderConverter.h"
 
 #include "core/css/BasicShapeFunctions.h"
 #include "core/css/CSSBasicShapeValues.h"
 #include "core/css/CSSContentDistributionValue.h"
 #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"
 #include "core/css/CSSIdentifierValue.h"
 #include "core/css/CSSPathValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSQuadValue.h"
 #include "core/css/CSSReflectValue.h"
 #include "core/css/CSSShadowValue.h"
 #include "core/css/CSSStringValue.h"
@@ skipping 198 matching lines @@
   const CSSValueList& list = toCSSValueList(value);
   RefPtr<FontFeatureSettings> settings = FontFeatureSettings::create();
   int len = list.length();
   for (int i = 0; i < len; ++i) {
     const CSSFontFeatureValue& feature = toCSSFontFeatureValue(list.item(i));
     settings->append(FontFeature(feature.tag(), feature.value()));
   }
   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) {
   if (primitiveValue.isLength())
     return primitiveValue.computeLength<float>(state.fontSizeConversionData());
   if (primitiveValue.isCalculatedPercentageWithLength())
     return primitiveValue.cssCalcValue()
         ->toCalcValue(state.fontSizeConversionData())
         ->evaluate(parentSize.value);
 
@@ skipping 1013 matching lines @@
       // Instead of the actual zoom, use 1 to avoid potential rounding errors
       Length length = primitiveValue.convertToLength(
           state.cssToLengthConversionData().copyWithAdjustedZoom(1));
       return *CSSPrimitiveValue::create(length, 1);
     }
   }
   return value;
 }
 
 }  // namespace blink