Add font-stretch to FontDescription

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 24 matching lines @@
 #include "wtf/text/StringHash.h"
 
 namespace WebCore {
 
 struct SameSizeAsFontDescription {
     FontFamily familyList;
     RefPtr<FontFeatureSettings> m_featureSettings;
     float sizes[4];
     // FXIME: Make them fit into one word.
     uint32_t bitfields;
-    uint32_t bitfields2 : 8;
+    uint32_t bitfields2 : 12;
 };
 
 COMPILE_ASSERT(sizeof(FontDescription) == sizeof(SameSizeAsFontDescription), FontDescription_should_stay_small);
 
 TypesettingFeatures FontDescription::s_defaultTypesettingFeatures = 0;
 
 bool FontDescription::s_useSubpixelTextPositioning = false;
 
 FontWeight FontDescription::lighterWeight(void) const
 {
@@ skipping 36 matching lines @@
             return FontWeight900;
     }
     ASSERT_NOT_REACHED();
     return FontWeightNormal;
 }
 
 FontTraitsMask FontDescription::traitsMask() const
 {
     return static_cast<FontTraitsMask>((m_italic ? FontStyleItalicMask : FontStyleNormalMask)
             | (m_smallCaps ? FontVariantSmallCapsMask : FontVariantNormalMask)
-            | (FontWeight100Mask << (m_weight - FontWeight100)));
-
+            | (FontWeight100Mask << (m_weight - FontWeight100))
+            | (m_stretch << FontStretchBit1));
 }
 
 void FontDescription::setTraitsMask(FontTraitsMask traitsMask)
 {
     switch (traitsMask & FontWeightMask) {
     case FontWeight100Mask:
         setWeight(FontWeight100);
         break;
     case FontWeight200Mask:
         setWeight(FontWeight200);
@@ skipping 17 matching lines @@
         setWeight(FontWeight800);
         break;
     case FontWeight900Mask:
         setWeight(FontWeight900);
         break;
     default:
         ASSERT_NOT_REACHED();
     }
     setItalic((traitsMask & FontStyleItalicMask) ? FontItalicOn : FontItalicOff);
     setSmallCaps((traitsMask & FontVariantSmallCapsMask) ? FontSmallCapsOn : FontSmallCapsOff);
+    setStretch(static_cast<FontStretch>((traitsMask & FontStretchMask) >> FontStretchBit1));
 }
 
 FontDescription FontDescription::makeNormalFeatureSettings() const
 {
     FontDescription normalDescription(*this);
     normalDescription.setFeatureSettings(nullptr);
     return normalDescription;
 }
 
 float FontDescription::effectiveFontSize() const
@@ skipping 69 matching lines @@
         break;
     case FontDescription::EnabledLigaturesState:
         m_typesettingFeatures |= Ligatures;
         break;
     case FontDescription::NormalLigaturesState:
         break;
     }
 }
 
 } // namespace WebCore