Implement font-variant-numeric

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 320 matching lines @@
     ASSERT_WITH_SECURITY_IMPLICATION(value.isPrimitiveValue());
 
     if (toCSSPrimitiveValue(value).getValueID() == CSSValueNone) {
         return FontDescription::VariantLigatures(FontDescription::DisabledLigaturesState);
     }
 
     ASSERT(toCSSPrimitiveValue(value).getValueID() == CSSValueNormal);
     return FontDescription::VariantLigatures();
 }
 
+FontVariantNumeric StyleBuilderConverter::convertFontVariantNumeric(StyleResolverState&, const CSSValue& value)
+{
+    if (value.isValueList()) {

[Timothy Loh, 2016/05/10 05:26:26]

I would put the 'none' check up first, i.e.

if (value.isPrimitiveValue()) {
    ASSERT(... == CSSValueNone);
    return ...;
}

[drott, 2016/05/10 10:59:06]

I assume you meant the "normal" check? Done.

+        FontVariantNumeric variantNumeric;
+        const CSSValueList& valueList = toCSSValueList(value);
+        for (size_t i = 0; i < valueList.length(); ++i) {

[Timothy Loh, 2016/05/10 05:26:26]

for (const CSSValue* feature : toCSSValueList(value))

[drott, 2016/05/10 10:59:06]

Changed accordingly.

+            const CSSValue& item = *valueList.item(i);
+            const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(item);
+            switch (primitiveValue.getValueID()) {
+            case CSSValueLiningNums:
+                variantNumeric.setNumericFigure(FontVariantNumeric::LiningNums);
+                break;
+            case CSSValueOldstyleNums:
+                variantNumeric.setNumericFigure(FontVariantNumeric::OldstyleNums);
+                break;
+            case CSSValueProportionalNums:
+                variantNumeric.setNumericSpacing(FontVariantNumeric::ProportionalNums);
+                break;
+            case CSSValueTabularNums:
+                variantNumeric.setNumericSpacing(FontVariantNumeric::TabularNums);
+                break;
+            case CSSValueDiagonalFractions:
+                variantNumeric.setNumericFraction(FontVariantNumeric::DiagonalFractions);
+                break;
+            case CSSValueStackedFractions:
+                variantNumeric.setNumericFraction(FontVariantNumeric::StackedFractions);
+                break;
+            case CSSValueOrdinal:
+                variantNumeric.setOrdinal(FontVariantNumeric::OrdinalOn);
+                break;
+            case CSSValueSlashedZero:
+                variantNumeric.setSlashedZero(FontVariantNumeric::SlashedZeroOn);
+                break;
+            default:
+                ASSERT_NOT_REACHED();
+                break;
+            }
+        }
+        return variantNumeric;
+    }
+
+    ASSERT_WITH_SECURITY_IMPLICATION(value.isPrimitiveValue());

[Timothy Loh, 2016/05/10 05:26:26]

btw this line is redundant because toCSSPrimitiveValue has this exact assertion

[drott, 2016/05/10 10:59:06]

Not needed anymore due to the inversed order of checks.

+    ASSERT(toCSSPrimitiveValue(value).getValueID() == CSSValueNormal);
+    return FontVariantNumeric();
+}
+
 StyleSelfAlignmentData StyleBuilderConverter::convertSelfOrDefaultAlignmentData(StyleResolverState&, const CSSValue& value)
 {
     StyleSelfAlignmentData alignmentData = ComputedStyle::initialSelfAlignment();
     if (value.isValuePair()) {
         const CSSValuePair& pair = toCSSValuePair(value);
         if (toCSSPrimitiveValue(pair.first()).getValueID() == CSSValueLegacy) {
             alignmentData.setPositionType(LegacyPosition);
             alignmentData.setPosition(toCSSPrimitiveValue(pair.second()).convertTo<ItemPosition>());
         } else {
             alignmentData.setPosition(toCSSPrimitiveValue(pair.first()).convertTo<ItemPosition>());
@@ skipping 650 matching lines @@
 
 PassRefPtr<StylePath> StyleBuilderConverter::convertPathOrNone(StyleResolverState& state, const CSSValue& value)
 {
     if (value.isPathValue())
         return toCSSPathValue(value).stylePath();
     ASSERT(value.isPrimitiveValue() && toCSSPrimitiveValue(value).getValueID() == CSSValueNone);
     return nullptr;
 }
 
 } // namespace blink