Implement font-variant-numeric

third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 660 matching lines @@
         valueList->append(cssValuePool().createIdentifierValue(commonLigaturesState == FontDescription::DisabledLigaturesState ? CSSValueNoCommonLigatures : CSSValueCommonLigatures));
     if (discretionaryLigaturesState != FontDescription::NormalLigaturesState)
         valueList->append(cssValuePool().createIdentifierValue(discretionaryLigaturesState == FontDescription::DisabledLigaturesState ? CSSValueNoDiscretionaryLigatures : CSSValueDiscretionaryLigatures));
     if (historicalLigaturesState != FontDescription::NormalLigaturesState)
         valueList->append(cssValuePool().createIdentifierValue(historicalLigaturesState == FontDescription::DisabledLigaturesState ? CSSValueNoHistoricalLigatures : CSSValueHistoricalLigatures));
     if (contextualLigaturesState != FontDescription::NormalLigaturesState)
         valueList->append(cssValuePool().createIdentifierValue(contextualLigaturesState == FontDescription::DisabledLigaturesState ? CSSValueNoContextual : CSSValueContextual));
     return valueList;
 }
 
+static CSSValue* valueForFontVariantNumeric(const ComputedStyle& style)
+{
+    FontVariantNumeric variantNumeric = style.getFontDescription().variantNumeric();
+    if (variantNumeric.isAllNormal())
+        return cssValuePool().createIdentifierValue(CSSValueNormal);
+
+    CSSValueList* valueList = CSSValueList::createSpaceSeparated();
+    if (variantNumeric.numericFigure() != FontVariantNumeric::NormalFigure)
+        valueList->append(cssValuePool().createIdentifierValue(variantNumeric.numericFigure() == FontVariantNumeric::LiningNums ? CSSValueLiningNums : CSSValueOldstyleNums));
+    if (variantNumeric.numericSpacing() != FontVariantNumeric::NormalSpacing)
+        valueList->append(cssValuePool().createIdentifierValue(variantNumeric.numericSpacing() == FontVariantNumeric::ProportionalNums ? CSSValueProportionalNums : CSSValueTabularNums));
+    if (variantNumeric.numericFraction() != FontVariantNumeric::NormalFraction)
+        valueList->append(cssValuePool().createIdentifierValue(variantNumeric.numericFraction() == FontVariantNumeric::DiagonalFractions ? CSSValueDiagonalFractions : CSSValueStackedFractions));
+    if (variantNumeric.ordinal() == FontVariantNumeric::OrdinalOn)
+        valueList->append(cssValuePool().createIdentifierValue(CSSValueOrdinal));
+    if (variantNumeric.slashedZero() == FontVariantNumeric::SlashedZeroOn)
+        valueList->append(cssValuePool().createIdentifierValue(CSSValueSlashedZero));
+
+    return valueList;
+}
+
+
 static CSSValue* specifiedValueForGridTrackBreadth(const GridLength& trackBreadth, const ComputedStyle& style)
 {
     if (!trackBreadth.isLength())
         return cssValuePool().createValue(trackBreadth.flex(), CSSPrimitiveValue::UnitType::Fraction);
 
     const Length& trackBreadthLength = trackBreadth.length();
     if (trackBreadthLength.isAuto())
         return cssValuePool().createIdentifierValue(CSSValueAuto);
     return zoomAdjustedPixelValueForLength(trackBreadthLength, style);
 }
@@ skipping 740 matching lines @@
     // Add a slash between size and line-height.
     CSSValueList* sizeAndLineHeight = CSSValueList::createSlashSeparated();
     sizeAndLineHeight->append(valueForFontSize(style));
     sizeAndLineHeight->append(valueForLineHeight(style));
 
     CSSValueList* list = CSSValueList::createSpaceSeparated();
     list->append(valueForFontStyle(style));
 
     // Check that non-initial font-variant subproperties are not conflicting with this serialization.
     CSSValue* ligaturesValue = valueForFontVariantLigatures(style);
-    if (!ligaturesValue->equals(*cssValuePool().createIdentifierValue(CSSValueNormal)))
+    CSSValue* numericValue = valueForFontVariantNumeric(style);
+    if (!ligaturesValue->equals(*cssValuePool().createIdentifierValue(CSSValueNormal))
+        || !numericValue->equals(*cssValuePool().createIdentifierValue(CSSValueNormal)))
         return nullptr;
 
     CSSPrimitiveValue* capsValue = valueForFontVariantCaps(style);
     if (!capsValue->equals(*cssValuePool().createIdentifierValue(CSSValueNormal))
         && !capsValue->equals(*cssValuePool().createIdentifierValue(CSSValueSmallCaps)))
         return nullptr;
     list->append(capsValue);
 
     list->append(valueForFontWeight(style));
     list->append(valueForFontStretch(style));
@@ skipping 803 matching lines @@
     case CSSPropertyResize:
         return cssValuePool().createValue(style.resize());
     case CSSPropertyFontKerning:
         return cssValuePool().createValue(style.getFontDescription().getKerning());
     case CSSPropertyWebkitFontSmoothing:
         return cssValuePool().createValue(style.getFontDescription().fontSmoothing());
     case CSSPropertyFontVariantLigatures:
         return valueForFontVariantLigatures(style);
     case CSSPropertyFontVariantCaps:
         return valueForFontVariantCaps(style);
+    case CSSPropertyFontVariantNumeric:
+        return valueForFontVariantNumeric(style);
     case CSSPropertyZIndex:
         if (style.hasAutoZIndex())
             return cssValuePool().createIdentifierValue(CSSValueAuto);
         return cssValuePool().createValue(style.zIndex(), CSSPrimitiveValue::UnitType::Integer);
     case CSSPropertyZoom:
         return cssValuePool().createValue(style.zoom(), CSSPrimitiveValue::UnitType::Number);
     case CSSPropertyBoxSizing:
         if (style.boxSizing() == BoxSizingContentBox)
             return cssValuePool().createIdentifierValue(CSSValueContentBox);
         return cssValuePool().createIdentifierValue(CSSValueBorderBox);
@@ skipping 636 matching lines @@
     case CSSPropertyAll:
         return nullptr;
     default:
         break;
     }
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
 } // namespace blink