Add CSS support for font-variation-settings

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 23 matching lines @@
 #include "wtf/StringHasher.h"
 #include "wtf/text/AtomicStringHash.h"
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
 struct SameSizeAsFontDescription {
   DISALLOW_NEW();
   FontFamily familyList;
   RefPtr<FontFeatureSettings> m_featureSettings;
+  RefPtr<FontVariationSettings> m_variationSettings;
   AtomicString locale;
   float sizes[6];
   FieldsAsUnsignedType bitfields;
 };
 
 static_assert(sizeof(FontDescription) == sizeof(SameSizeAsFontDescription),
               "FontDescription should stay small");
 
 TypesettingFeatures FontDescription::s_defaultTypesettingFeatures = 0;
 
@@ skipping 41 matching lines @@
          m_specifiedSize == other.m_specifiedSize &&
          m_computedSize == other.m_computedSize &&
          m_adjustedSize == other.m_adjustedSize &&
          m_sizeAdjust == other.m_sizeAdjust &&
          m_letterSpacing == other.m_letterSpacing &&
          m_wordSpacing == other.m_wordSpacing &&
          m_fieldsAsUnsigned.parts[0] == other.m_fieldsAsUnsigned.parts[0] &&
          m_fieldsAsUnsigned.parts[1] == other.m_fieldsAsUnsigned.parts[1] &&
          (m_featureSettings == other.m_featureSettings ||
           (m_featureSettings && other.m_featureSettings &&
-           *m_featureSettings == *other.m_featureSettings));
+           *m_featureSettings == *other.m_featureSettings)) &&
+         (m_variationSettings == other.m_variationSettings ||
+          (m_variationSettings && other.m_variationSettings &&
+           *m_variationSettings == *other.m_variationSettings));
 }
 
 FontWeight FontDescription::lighterWeight(FontWeight weight) {
   switch (weight) {
     case FontWeight100:
     case FontWeight200:
     case FontWeight300:
     case FontWeight400:
     case FontWeight500:
       return FontWeight100;
@@ skipping 184 matching lines @@
   const FontFeatureSettings* settings = featureSettings();
   if (settings) {
     unsigned numFeatures = settings->size();
     for (unsigned i = 0; i < numFeatures; ++i) {
       const AtomicString& tag = settings->at(i).tag();
       for (unsigned j = 0; j < tag.length(); j++)
         stringHasher.addCharacter(tag[j]);
       addToHash(hash, settings->at(i).value());
     }
   }
+  const FontVariationSettings* varSettings = variationSettings();
+  if (varSettings) {
+    unsigned numFeatures = varSettings->size();
+    for (unsigned i = 0; i < numFeatures; ++i) {
+      const AtomicString& tag = varSettings->at(i).tag();
+      for (unsigned j = 0; j < tag.length(); j++)
+        stringHasher.addCharacter(tag[j]);
+      addToHash(hash, varSettings->at(i).value());
+    }
+  }
+
   if (m_locale) {
     const AtomicString& locale = m_locale->localeString();
     for (unsigned i = 0; i < locale.length(); i++)
       stringHasher.addCharacter(locale[i]);
   }
   addToHash(hash, stringHasher.hash());
 
   addFloatToHash(hash, m_specifiedSize);
   addFloatToHash(hash, m_computedSize);
   addFloatToHash(hash, m_adjustedSize);
@@ skipping 30 matching lines @@
       "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::kUltraExpanded_Width),
                 "FontStretchUltraExpanded should map to kUltraExpanded_Width");
 }
 
 }  // namespace blink