Implement font-variant-numeric

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

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 527 matching lines @@
     }
 
     char prefix = '\0';
     switch (propertyID) {
     case CSSPropertyFontStyle:
         break; // No prefix.
     case CSSPropertyFontFamily:
     case CSSPropertyFontStretch:
     case CSSPropertyFontVariantCaps:
     case CSSPropertyFontVariantLigatures:
+    case CSSPropertyFontVariantNumeric:
     case CSSPropertyFontWeight:
         prefix = ' ';
         break;
     case CSSPropertyLineHeight:
         prefix = '/';
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 
@@ skipping 17 matching lines @@
 
 String StylePropertySerializer::fontValue() const
 {
     if (!isPropertyShorthandAvailable(fontShorthand()) && !shorthandHasOnlyInitialOrInheritedValue(fontShorthand()))
         return emptyString();
 
     int fontSizePropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyFontSize);
     int fontFamilyPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyFontFamily);
     int fontVariantCapsPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyFontVariantCaps);
     int fontVariantLigaturesPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyFontVariantLigatures);
+    int fontVariantNumericPropertyIndex = m_propertySet.findPropertyIndex(CSSPropertyFontVariantNumeric);
     DCHECK_NE(fontSizePropertyIndex, -1);
     DCHECK_NE(fontFamilyPropertyIndex, -1);
     DCHECK_NE(fontVariantCapsPropertyIndex, -1);
     DCHECK_NE(fontVariantLigaturesPropertyIndex, -1);
+    DCHECK_NE(fontVariantNumericPropertyIndex, -1);
 
     PropertyValueForSerializer fontSizeProperty = m_propertySet.propertyAt(fontSizePropertyIndex);
     PropertyValueForSerializer fontFamilyProperty = m_propertySet.propertyAt(fontFamilyPropertyIndex);
     PropertyValueForSerializer fontVariantCapsProperty = m_propertySet.propertyAt(fontVariantCapsPropertyIndex);
     PropertyValueForSerializer fontVariantLigaturesProperty = m_propertySet.propertyAt(fontVariantLigaturesPropertyIndex);
+    PropertyValueForSerializer fontVariantNumericProperty = m_propertySet.propertyAt(fontVariantNumericPropertyIndex);
 
     // Check that non-initial font-variant subproperties are not conflicting with this serialization.
     const CSSValue* ligaturesValue = fontVariantLigaturesProperty.value();
+    const CSSValue* numericValue = fontVariantNumericProperty.value();
     if ((ligaturesValue->isPrimitiveValue()
         && toCSSPrimitiveValue(ligaturesValue)->getValueID() != CSSValueNormal)
-        || ligaturesValue->isValueList())
+        || ligaturesValue->isValueList()
+        || (numericValue->isPrimitiveValue()
+        && toCSSPrimitiveValue(numericValue)->getValueID() != CSSValueNormal)
+        || numericValue->isValueList())
         return emptyString();
 
     String commonValue = fontSizeProperty.value()->cssText();
     StringBuilder result;
     appendFontLonghandValueIfNotNormal(CSSPropertyFontStyle, result, commonValue);
 
     const CSSValue* val = fontVariantCapsProperty.value();
     if (val->isPrimitiveValue()
         && (toCSSPrimitiveValue(val)->getValueID() != CSSValueSmallCaps
         && toCSSPrimitiveValue(val)->getValueID() != CSSValueNormal))
@@ skipping 23 matching lines @@
     }
 
     StringBuilder result;
 
     // TODO(drott): Decide how we want to return ligature values in shorthands, reduced to "none" or
     // spelled out, filed as W3C bug:
     // https://www.w3.org/Bugs/Public/show_bug.cgi?id=29594
     String dummyCommonValue;
     appendFontLonghandValueIfNotNormal(CSSPropertyFontVariantLigatures, result, dummyCommonValue);
     appendFontLonghandValueIfNotNormal(CSSPropertyFontVariantCaps, result, dummyCommonValue);
+    appendFontLonghandValueIfNotNormal(CSSPropertyFontVariantNumeric, result, dummyCommonValue);
 
     if (result.isEmpty()) {
         return "normal";
     }
 
     return result.toString();
 }
 
 String StylePropertySerializer::get4Values(const StylePropertyShorthand& shorthand) const
 {
@@ skipping 418 matching lines @@
             isInitialValue = false;
         if (!value->isInheritedValue())
             isInheritedValue = false;
         if (isImportant != m_propertySet.propertyIsImportant(shorthand.properties()[i]))
             return false;
     }
     return isInitialValue || isInheritedValue;
 }
 
 } // namespace blink