| Index: third_party/WebKit/Source/platform/fonts/FontDescription.h
|
| diff --git a/third_party/WebKit/Source/platform/fonts/FontDescription.h b/third_party/WebKit/Source/platform/fonts/FontDescription.h
|
| index 594164f5ca447b6a5e0ecaba8bfe6ebf830334b3..308d6aae0d440f5181ef8aba1a9de1c43b7b1d05 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/FontDescription.h
|
| +++ b/third_party/WebKit/Source/platform/fonts/FontDescription.h
|
| @@ -228,6 +228,9 @@ class PLATFORM_EXPORT FontDescription {
|
| FontFeatureSettings* featureSettings() const {
|
| return m_featureSettings.get();
|
| }
|
| + FontVariationSettings* variationSettings() const {
|
| + return m_variationSettings.get();
|
| + }
|
|
|
| float effectiveFontSize()
|
| const; // Returns either the computedSize or the computedPixelSize
|
| @@ -277,6 +280,9 @@ class PLATFORM_EXPORT FontDescription {
|
| 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) {
|
| @@ -315,6 +321,7 @@ class PLATFORM_EXPORT FontDescription {
|
| 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();
|
|
|