Improve CSS Style matching spec compliance

Source/core/css/FontFace.cpp

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 132 matching lines @@
 }
 
 FontFace::FontFace(ExecutionContext* context, const AtomicString& family, const FontFaceDescriptors& descriptors)
     : ActiveDOMObject(context)
     , m_family(family)
     , m_status(Unloaded)
 {
     Document* document = toDocument(context);
     setPropertyFromString(document, descriptors.style(), CSSPropertyFontStyle);
     setPropertyFromString(document, descriptors.weight(), CSSPropertyFontWeight);
-    // FIXME: we don't implement 'font-strech' property yet so we can't set the property.
+    setPropertyFromString(document, descriptors.stretch(), CSSPropertyFontStretch);
     setPropertyFromString(document, descriptors.unicodeRange(), CSSPropertyUnicodeRange);
     setPropertyFromString(document, descriptors.variant(), CSSPropertyFontVariant);
     setPropertyFromString(document, descriptors.featureSettings(), CSSPropertyWebkitFontFeatureSettings);
 
     suspendIfNeeded();
 }
 
 FontFace::~FontFace()
 {
 }
@@ skipping 227 matching lines @@
 {
     if (m_status != Unloaded)
         return;
 
     m_cssFontFace->load();
     toDocument(context)->styleEngine().fontSelector()->fontLoader()->loadPendingFonts();
 }
 
 FontTraits FontFace::traits() const
 {
+    FontStretch stretch = FontStretchNormal;
+    if (m_stretch) {
+        if (!m_stretch->isPrimitiveValue())
+            return 0;
+
+        switch (toCSSPrimitiveValue(m_stretch.get())->getValueID()) {
+        case CSSValueUltraCondensed:
+            stretch = FontStretchUltraCondensed;
+            break;
+        case CSSValueExtraCondensed:
+            stretch = FontStretchExtraCondensed;
+            break;
+        case CSSValueCondensed:
+            stretch = FontStretchCondensed;
+            break;
+        case CSSValueSemiCondensed:
+            stretch = FontStretchSemiCondensed;
+            break;
+        case CSSValueSemiExpanded:
+            stretch = FontStretchSemiExpanded;
+            break;
+        case CSSValueExpanded:
+            stretch = FontStretchExpanded;
+            break;
+        case CSSValueExtraExpanded:
+            stretch = FontStretchExtraExpanded;
+            break;
+        case CSSValueUltraExpanded:
+            stretch = FontStretchUltraExpanded;
+            break;
+        default:
+            break;
+        }
+    }
+
     FontStyle style = FontStyleNormal;
     if (m_style) {
         if (!m_style->isPrimitiveValue())
             return 0;
 
         switch (toCSSPrimitiveValue(m_style.get())->getValueID()) {
         case CSSValueNormal:
             style = FontStyleNormal;
             break;
+        case CSSValueOblique:
+            style = FontStyleOblique;
+            break;
         case CSSValueItalic:
-        case CSSValueOblique:
             style = FontStyleItalic;
             break;
         default:
             break;
         }
     }
 
     FontWeight weight = FontWeight400;
     if (m_weight) {
         if (!m_weight->isPrimitiveValue())
@@ skipping 63 matching lines @@
                 break;
             case CSSValueSmallCaps:
                 variant = FontVariantSmallCaps;
                 break;
             default:
                 break;
             }
         }
     }
 
-    return FontTraits(style, variant, weight, FontStretchNormal);
+    return FontTraits(style, variant, weight, stretch);
 }
 
 static PassOwnPtrWillBeRawPtr<CSSFontFace> createCSSFontFace(FontFace* fontFace, CSSValue* unicodeRange)
 {
     Vector<CSSFontFace::UnicodeRange> ranges;
     if (CSSValueList* rangeList = toCSSValueList(unicodeRange)) {
         unsigned numRanges = rangeList->length();
         for (unsigned i = 0; i < numRanges; i++) {
             CSSUnicodeRangeValue* range = toCSSUnicodeRangeValue(rangeList->item(i));
             ranges.append(CSSFontFace::UnicodeRange(range->from(), range->to()));
@@ skipping 74 matching lines @@
 {
     return m_cssFontFace->hadBlankText();
 }
 
 bool FontFace::hasPendingActivity() const
 {
     return m_status == Loading && executionContext() && !executionContext()->activeDOMObjectsAreStopped();
 }
 
 } // namespace blink