Add CSS support for font-variation-settings

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

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 210 matching lines @@
   }
   bool isVerticalBaseline() const {
     return blink::isVerticalBaseline(orientation());
   }
   FontWidthVariant widthVariant() const {
     return static_cast<FontWidthVariant>(m_fields.m_widthVariant);
   }
   FontFeatureSettings* featureSettings() const {
     return m_featureSettings.get();
   }
+  FontVariationSettings* variationSettings() const {
+    return m_variationSettings.get();
+  }
 
   float effectiveFontSize()
       const;  // Returns either the computedSize or the computedPixelSize
   FontCacheKey cacheKey(const FontFaceCreationParams&,
                         FontTraits desiredTraits = FontTraits(0)) const;
 
   void setFamily(const FontFamily& family) { m_familyList = family; }
   void setComputedSize(float s) { m_computedSize = clampTo<float>(s); }
   void setSpecifiedSize(float s) { m_specifiedSize = clampTo<float>(s); }
   void setAdjustedSize(float s) { m_adjustedSize = clampTo<float>(s); }
@@ skipping 29 matching lines @@
   void setLocale(PassRefPtr<const LayoutLocale> locale) { m_locale = locale; }
   void setSyntheticBold(bool syntheticBold) {
     m_fields.m_syntheticBold = syntheticBold;
   }
   void setSyntheticItalic(bool syntheticItalic) {
     m_fields.m_syntheticItalic = syntheticItalic;
   }
   void setFeatureSettings(PassRefPtr<FontFeatureSettings> settings) {
     m_featureSettings = settings;
   }
+  void setVariationSettings(PassRefPtr<FontVariationSettings> settings) {
+    m_variationSettings = settings;
+  }
   void setTraits(FontTraits);
   void setWordSpacing(float s) { m_wordSpacing = s; }
   void setLetterSpacing(float s) {
     m_letterSpacing = s;
     updateTypesettingFeatures();
   }
 
   TypesettingFeatures getTypesettingFeatures() const {
     return static_cast<TypesettingFeatures>(m_fields.m_typesettingFeatures);
   }
@@ skipping 18 matching lines @@
   // TODO(drott): We should not expose internal structure here, but rather
   // introduce a hash function here.
   unsigned bitmapFields() const { return m_fieldsAsUnsigned.parts[0]; }
   unsigned auxiliaryBitmapFields() const { return m_fieldsAsUnsigned.parts[1]; }
 
   SkFontStyle skiaFontStyle() const;
 
  private:
   FontFamily m_familyList;  // The list of font families to be used.
   RefPtr<FontFeatureSettings> m_featureSettings;
+  RefPtr<FontVariationSettings> m_variationSettings;
   RefPtr<const LayoutLocale> m_locale;
 
   void updateTypesettingFeatures();
 
   // Specified CSS value. Independent of rendering issues such as integer
   // rounding, minimum font sizes, and zooming.
   float m_specifiedSize;
   // Computed size adjusted for the minimum font size and the zoom factor.
   float m_computedSize;
 
@@ skipping 55 matching lines @@
   };
 
   static TypesettingFeatures s_defaultTypesettingFeatures;
 
   static bool s_useSubpixelTextPositioning;
 };
 
 }  // namespace blink
 
 #endif