Initial OpenType Font Variations Support

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 206 matching lines @@
   FontTraits fontTraits = desiredTraits.bitfield() ? desiredTraits : traits();
 
   unsigned options =
       static_cast<unsigned>(m_fields.m_syntheticItalic) << 6 |  // bit 7
       static_cast<unsigned>(m_fields.m_syntheticBold) << 5 |    // bit 6
       static_cast<unsigned>(m_fields.m_textRendering) << 3 |    // bits 4-5
       static_cast<unsigned>(m_fields.m_orientation) << 1 |      // bit 2-3
       static_cast<unsigned>(m_fields.m_subpixelTextPosition);   // bit 1
 
   return FontCacheKey(creationParams, effectiveFontSize(),
-                      options | fontTraits.bitfield() << 8);
+                      options | fontTraits.bitfield() << 8,
+                      m_variationSettings);
 }
 
 void FontDescription::setDefaultTypesettingFeatures(
     TypesettingFeatures typesettingFeatures) {
   s_defaultTypesettingFeatures = typesettingFeatures;
 }
 
 TypesettingFeatures FontDescription::defaultTypesettingFeatures() {
   return s_defaultTypesettingFeatures;
 }
@@ skipping 66 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 (variationSettings())
+    addToHash(hash, variationSettings()->hash());
 
   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);
@@ skipping 31 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