Implement the new text-size-adjust CSS property

third_party/WebKit/Source/core/style/ComputedStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 569 matching lines @@
             || rareInheritedData->hyphenationString != other.rareInheritedData->hyphenationString
             || rareInheritedData->m_respectImageOrientation != other.rareInheritedData->m_respectImageOrientation
             || rareInheritedData->m_rubyPosition != other.rareInheritedData->m_rubyPosition
             || rareInheritedData->textEmphasisMark != other.rareInheritedData->textEmphasisMark
             || rareInheritedData->textEmphasisPosition != other.rareInheritedData->textEmphasisPosition
             || rareInheritedData->textEmphasisCustomMark != other.rareInheritedData->textEmphasisCustomMark
             || rareInheritedData->m_textJustify != other.rareInheritedData->m_textJustify
             || rareInheritedData->m_textOrientation != other.rareInheritedData->m_textOrientation
             || rareInheritedData->m_textCombine != other.rareInheritedData->m_textCombine
             || rareInheritedData->m_tabSize != other.rareInheritedData->m_tabSize
+            || rareInheritedData->m_textSizeAdjust != other.rareInheritedData->m_textSizeAdjust
             || rareInheritedData->listStyleImage != other.rareInheritedData->listStyleImage
             || rareInheritedData->m_snapHeightUnit != other.rareInheritedData->m_snapHeightUnit
             || rareInheritedData->m_snapHeightPosition != other.rareInheritedData->m_snapHeightPosition
             || rareInheritedData->textStrokeWidth != other.rareInheritedData->textStrokeWidth)
             return true;
 
         if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.get()))
             return true;
 
         if (!rareInheritedData->quotesDataEquivalent(*other.rareInheritedData.get()))
@@ skipping 741 matching lines @@
 }
 
 const Length& ComputedStyle::specifiedLineHeight() const { return inherited->line_height; }
 Length ComputedStyle::lineHeight() const
 {
     const Length& lh = inherited->line_height;
     // Unlike getFontDescription().computedSize() and hence fontSize(), this is
     // recalculated on demand as we only store the specified line height.
     // FIXME: Should consider scaling the fixed part of any calc expressions
     // too, though this involves messily poking into CalcExpressionLength.
-    float multiplier = textAutosizingMultiplier();
-    if (multiplier > 1 && lh.isFixed())
+    if (lh.isFixed()) {
+        float multiplier = textAutosizingMultiplier();
         return Length(TextAutosizer::computeAutosizedFontSize(lh.value(), multiplier), Fixed);
+    }
 
     return lh;
 }
 
 void ComputedStyle::setLineHeight(const Length& specifiedLineHeight) { SET_VAR(inherited, line_height, specifiedLineHeight); }
 
 int ComputedStyle::computedLineHeight() const
 {
     const Length& lh = lineHeight();
 
@@ skipping 36 matching lines @@
     if (!std::isfinite(size) || size < 0)
         size = 0;
     else
         size = std::min(maximumAllowedFontSize, size);
 
     FontSelector* currentFontSelector = font().getFontSelector();
     FontDescription desc(getFontDescription());
     desc.setSpecifiedSize(size);
     desc.setComputedSize(size);
 
-    if (multiplier > 1) {
-        float autosizedFontSize = TextAutosizer::computeAutosizedFontSize(size, multiplier);
-        desc.setComputedSize(std::min(maximumAllowedFontSize, autosizedFontSize));
-    }
+    float autosizedFontSize = TextAutosizer::computeAutosizedFontSize(size, multiplier);
+    desc.setComputedSize(std::min(maximumAllowedFontSize, autosizedFontSize));
 
     setFontDescription(desc);
     font().update(currentFontSelector);
 }
 
 void ComputedStyle::addAppliedTextDecoration(const AppliedTextDecoration& decoration)
 {
     RefPtr<AppliedTextDecorationList>& list = rareInheritedData.access()->appliedTextDecorations;
 
     if (!list)
@@ skipping 450 matching lines @@
         if (value < 0)
             fvalue -= 0.5f;
         else
             fvalue += 0.5f;
     }
 
     return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 } // namespace blink