Implement font-variant-numeric

third_party/WebKit/Source/platform/fonts/FontDescription.cpp

 /*
  * Copyright (C) 2007 Nicholas Shanks <contact@nickshanks.com>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 24 matching lines @@
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
 struct SameSizeAsFontDescription {
     DISALLOW_NEW();
     FontFamily familyList;
     RefPtr<FontFeatureSettings> m_featureSettings;
     AtomicString locale;
     float sizes[6];
-    uint32_t bitfields[2];
+    FieldsAsUnsignedType bitfields;
 };
 
 static_assert(sizeof(FontDescription) == sizeof(SameSizeAsFontDescription), "FontDescription should stay small");
 
 TypesettingFeatures FontDescription::s_defaultTypesettingFeatures = 0;
 
 bool FontDescription::s_useSubpixelTextPositioning = false;
 
 FontWeight FontDescription::lighterWeight(FontWeight weight)
 {
@@ skipping 91 matching lines @@
 void FontDescription::setVariantLigatures(const VariantLigatures& ligatures)
 {
     m_fields.m_commonLigaturesState = ligatures.common;
     m_fields.m_discretionaryLigaturesState = ligatures.discretionary;
     m_fields.m_historicalLigaturesState = ligatures.historical;
     m_fields.m_contextualLigaturesState = ligatures.contextual;
 
     updateTypesettingFeatures();
 }
 
+void FontDescription::setVariantNumeric(const FontVariantNumeric& variantNumeric)
+{
+    m_fields.m_variantNumeric = variantNumeric.m_fieldsAsUnsigned;
+
+    updateTypesettingFeatures();
+}
+
 float FontDescription::effectiveFontSize() const
 {
     // Ensure that the effective precision matches the font-cache precision.
     // This guarantees that the same precision is used regardless of cache status.
     float computedOrAdjustedSize = hasSizeAdjust() ? adjustedSize() : computedSize();
     return floorf(computedOrAdjustedSize * FontCacheKey::precisionMultiplier()) / FontCacheKey::precisionMultiplier();
 }
 
 FontCacheKey FontDescription::cacheKey(const FontFaceCreationParams& creationParams, FontTraits desiredTraits) const
 {
@@ skipping 97 matching lines @@
     for (unsigned i = 0; i < m_locale.length(); i++)
         stringHasher.addCharacter(m_locale[i]);
     addToHash(hash, stringHasher.hash());
 
     addFloatToHash(hash, m_specifiedSize);
     addFloatToHash(hash, m_computedSize);
     addFloatToHash(hash, m_adjustedSize);
     addFloatToHash(hash, m_sizeAdjust);
     addFloatToHash(hash, m_letterSpacing);
     addFloatToHash(hash, m_wordSpacing);
-    addToHash(hash, m_fieldsAsUnsigned[0]);
-    addToHash(hash, m_fieldsAsUnsigned[1]);
+    addToHash(hash, m_fieldsAsUnsigned.f[0]);
+    addToHash(hash, m_fieldsAsUnsigned.f[1]);
 
     return hash;
 }
 
 SkFontStyle FontDescription::skiaFontStyle() const
 {
     int width = static_cast<int>(stretch());
     SkFontStyle::Slant slant = SkFontStyle::kUpright_Slant;
     switch (style()) {
     case FontStyleNormal: slant = SkFontStyle::kUpright_Slant; break;
     case FontStyleItalic: slant = SkFontStyle::kItalic_Slant; break;
     case FontStyleOblique: slant = SkFontStyle::kOblique_Slant; break;
     default: NOTREACHED(); break;
     }
     return SkFontStyle(numericFontWeight(weight()), width, slant);
     static_assert(
         static_cast<int>(FontStretchUltraCondensed) == static_cast<int>(SkFontStyle::kUltraCondensed_Width),
         "FontStretchUltraCondensed should map to kUltraCondensed_Width");
     static_assert(
         static_cast<int>(FontStretchNormal) == static_cast<int>(SkFontStyle::kNormal_Width),
         "FontStretchNormal should map to kNormal_Width");
     static_assert(
         static_cast<int>(FontStretchUltraExpanded) == static_cast<int>(SkFontStyle::kUltaExpanded_Width),
         "FontStretchUltraExpanded should map to kUltaExpanded_Width");
 }
 
 } // namespace blink