Initial implementation of font-size-adjust

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 22 matching lines @@
 #include "platform/RuntimeEnabledFeatures.h"
 #include "wtf/text/AtomicStringHash.h"
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
 struct SameSizeAsFontDescription {
     FontFamily familyList;
     RefPtr<FontFeatureSettings> m_featureSettings;
     AtomicString locale;
-    float sizes[4];
+    float sizes[5];
     // FXIME: Make them fit into one word.
     uint32_t bitfields;
     uint32_t bitfields2 : 7;
 };
 
 static_assert(sizeof(FontDescription) == sizeof(SameSizeAsFontDescription), "FontDescription should stay small");
 
 TypesettingFeatures FontDescription::s_defaultTypesettingFeatures = 0;
 
 bool FontDescription::s_useSubpixelTextPositioning = false;
@@ skipping 99 matching lines @@
     m_historicalLigaturesState = ligatures.historical;
     m_contextualLigaturesState = ligatures.contextual;
 
     updateTypesettingFeatures();
 }
 
 float FontDescription::effectiveFontSize() const
 {
     // Ensure that the effective precision matches the font-cache precision.
     // This guarantees that the same precision is used regardless of cache status.
-    return floorf(computedSize() * FontCacheKey::precisionMultiplier()) / FontCacheKey::precisionMultiplier();
+    float computedOrAdjustedSize = adjustedSize() ? adjustedSize() : computedSize();
+    return floorf(computedOrAdjustedSize * FontCacheKey::precisionMultiplier()) / FontCacheKey::precisionMultiplier();
 }
 
 FontCacheKey FontDescription::cacheKey(const FontFaceCreationParams& creationParams, FontTraits desiredTraits) const
 {
     FontTraits fontTraits = desiredTraits.bitfield() ? desiredTraits : traits();
 
     unsigned options =
         static_cast<unsigned>(m_syntheticItalic) << 5 | // bit 6
         static_cast<unsigned>(m_syntheticBold) << 4 | // bit 5
         static_cast<unsigned>(m_textRendering) << 2 | // bits 3-4
@@ skipping 59 matching lines @@
 
         if (discretionaryLigaturesState() == FontDescription::EnabledLigaturesState
             || historicalLigaturesState() == FontDescription::EnabledLigaturesState
             || contextualLigaturesState() == FontDescription::EnabledLigaturesState) {
             m_typesettingFeatures |= blink::Ligatures;
         }
     }
 }
 
 } // namespace blink