Initial implementation of font-size-adjust

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
  * License as published by the Free Software Foundation; either
@@ skipping 40 matching lines @@
                              MonospaceFamily, CursiveFamily, FantasyFamily, PictographFamily };
 
     enum Kerning { AutoKerning, NormalKerning, NoneKerning };
 
     enum LigaturesState { NormalLigaturesState, DisabledLigaturesState, EnabledLigaturesState };
 
     FontDescription()
         : m_locale("en")
         , m_specifiedSize(0)
         , m_computedSize(0)
+        , m_adjustedSize(0)
+        , m_sizeAdjust(0)
         , m_letterSpacing(0)
         , m_wordSpacing(0)
         , m_orientation(Horizontal)
         , m_nonCJKGlyphOrientation(NonCJKGlyphOrientationVerticalRight)
         , m_widthVariant(RegularWidth)
         , m_style(FontStyleNormal)
         , m_variant(FontVariantNormal)
         , m_isAbsoluteSize(false)
         , m_weight(FontWeightNormal)
         , m_stretch(FontStretchNormal)
@@ skipping 54 matching lines @@
         GenericFamilyType genericFamily;
         FontFamily family;
     };
 
     const FontFamily& family() const { return m_familyList; }
     FamilyDescription familyDescription() const { return FamilyDescription(genericFamily(), family()); }
     FontFamily& firstFamily() { return m_familyList; }
     Size size() const { return Size(m_keywordSize, m_specifiedSize, m_isAbsoluteSize); }
     float specifiedSize() const { return m_specifiedSize; }
     float computedSize() const { return m_computedSize; }
+    float adjustedSize() const { return m_adjustedSize; }
+    float sizeAdjust() const { return m_sizeAdjust; }
     FontStyle style() const { return static_cast<FontStyle>(m_style); }
     int computedPixelSize() const { return int(m_computedSize + 0.5f); }
     FontVariant variant() const { return static_cast<FontVariant>(m_variant); }
     bool isAbsoluteSize() const { return m_isAbsoluteSize; }
     FontWeight weight() const { return static_cast<FontWeight>(m_weight); }
     FontStretch stretch() const { return static_cast<FontStretch>(m_stretch); }
     static FontWeight lighterWeight(FontWeight);
     static FontWeight bolderWeight(FontWeight);
     static Size largerSize(const Size&);
     static Size smallerSize(const Size&);
@@ skipping 28 matching lines @@
     NonCJKGlyphOrientation nonCJKGlyphOrientation() const { return static_cast<NonCJKGlyphOrientation>(m_nonCJKGlyphOrientation); }
     FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant>(m_widthVariant); }
     FontFeatureSettings* featureSettings() const { return m_featureSettings.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); }
+    void setSizeAdjust(float aspect) { m_sizeAdjust = clampTo<float>(aspect); }
     void setStyle(FontStyle i) { m_style = i; }
     void setVariant(FontVariant c) { m_variant = c; }
     void setVariantLigatures(const VariantLigatures&);
     void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; }
     void setWeight(FontWeight w) { m_weight = w; }
     void setStretch(FontStretch s) { m_stretch = s; }
     void setGenericFamily(GenericFamilyType genericFamily) { m_genericFamily = genericFamily; }
     void setKerning(Kerning kerning) { m_kerning = kerning; updateTypesettingFeatures(); }
     void setKeywordSize(unsigned s) { m_keywordSize = s; }
     void setFontSmoothing(FontSmoothingMode smoothing) { m_fontSmoothing = smoothing; }
@@ skipping 22 matching lines @@
     FontFamily m_familyList; // The list of font families to be used.
     RefPtr<FontFeatureSettings> m_featureSettings;
     String m_locale;
 
     void updateTypesettingFeatures() const;
 
     float m_specifiedSize;   // Specified CSS value. Independent of rendering issues such as integer
                              // rounding, minimum font sizes, and zooming.
     float m_computedSize;    // Computed size adjusted for the minimum font size and the zoom factor.
 
+    float m_adjustedSize; // (Given aspect value / aspect value of a font family) * specifiedSize.
+        // This value is adjusted for the minimum font size and the zoom factor
+        // as well as a computed size is.
+    float m_sizeAdjust; // Given aspect value, i.e. font-size-adjust.
+
     float m_letterSpacing;
     float m_wordSpacing;
 
     unsigned m_orientation : 1; // FontOrientation - Whether the font is rendering on a horizontal line or a vertical line.
     unsigned m_nonCJKGlyphOrientation : 1; // NonCJKGlyphOrientation - Only used by vertical text. Determines the default orientation for non-ideograph glyphs.
 
     unsigned m_widthVariant : 2; // FontWidthVariant
 
     unsigned m_style : 1; // FontStyle
     unsigned m_variant : 1; // FontVariant
@@ skipping 26 matching lines @@
     static TypesettingFeatures s_defaultTypesettingFeatures;
 
     static bool s_useSubpixelTextPositioning;
 };
 
 inline bool FontDescription::operator==(const FontDescription& other) const
 {
     return m_familyList == other.m_familyList
         && 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_style == other.m_style
         && m_variant == other.m_variant
         && m_isAbsoluteSize == other.m_isAbsoluteSize
         && m_weight == other.m_weight
         && m_stretch == other.m_stretch
         && m_genericFamily == other.m_genericFamily
         && m_kerning == other.m_kerning
         && m_commonLigaturesState == other.m_commonLigaturesState
         && m_discretionaryLigaturesState == other.m_discretionaryLigaturesState
         && m_historicalLigaturesState == other.m_historicalLigaturesState
         && m_contextualLigaturesState == other.m_contextualLigaturesState
         && m_keywordSize == other.m_keywordSize
         && m_fontSmoothing == other.m_fontSmoothing
         && m_textRendering == other.m_textRendering
         && m_orientation == other.m_orientation
         && m_nonCJKGlyphOrientation == other.m_nonCJKGlyphOrientation
         && m_widthVariant == other.m_widthVariant
         && m_script == other.m_script
         && m_syntheticBold == other.m_syntheticBold
         && m_syntheticItalic == other.m_syntheticItalic
         && m_featureSettings == other.m_featureSettings
         && m_subpixelTextPosition == other.m_subpixelTextPosition;
 }
 
 } // namespace blink
 
 #endif