Revert 169264 "Add plumbing for font-stretch"

trunk/Source/core/css/parser/CSSPropertyParser.cpp

Index: trunk/Source/core/css/parser/CSSPropertyParser.cpp
===================================================================
--- trunk/Source/core/css/parser/CSSPropertyParser.cpp	(revision 169272)
+++ trunk/Source/core/css/parser/CSSPropertyParser.cpp	(working copy)
@@ -561,13 +561,6 @@
             return false;
         return parseFontWeight(important);
     }
-
-    case CSSPropertyFontStretch: { // normal | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra-expanded
-        if (m_valueList->size() != 1)
-            return false;
-        return parseFontStretch(important);
-    }
-
     case CSSPropertyBorderSpacing: {
         if (num == 1) {
             ShorthandScope scope(this, CSSPropertyBorderSpacing);
@@ -1445,6 +1438,8 @@
         return false;
     case CSSPropertyPage:
         return parsePage(propId, important);
+    case CSSPropertyFontStretch:
+        return false;
     // CSS Text Layout Module Level 3: Vertical writing support
     case CSSPropertyWebkitTextEmphasis:
         return parseShorthand(propId, webkitTextEmphasisShorthand(), important);
@@ -4540,7 +4535,6 @@
     bool fontStyleParsed = false;
     bool fontVariantParsed = false;
     bool fontWeightParsed = false;
-    bool fontStretchParsed = false;
     CSSParserValue* value;
     while ((value = m_valueList->current())) {
         if (!fontStyleParsed && isValidKeywordPropertyAndValue(CSSPropertyFontStyle, value->id, m_context)) {
@@ -4550,13 +4544,10 @@
             // Font variant in the shorthand is particular, it only accepts normal or small-caps.
             addProperty(CSSPropertyFontVariant, cssValuePool().createIdentifierValue(value->id), important);
             fontVariantParsed = true;
-        } else if (!fontWeightParsed && parseFontWeight(important)) {
+        } else if (!fontWeightParsed && parseFontWeight(important))
             fontWeightParsed = true;
-        } else if (!fontStretchParsed && parseFontStretch(important)) {
-            fontStretchParsed = true;
-        } else {
+        else
             break;
-        }
         m_valueList->next();
     }
 
@@ -4569,8 +4560,6 @@
         addProperty(CSSPropertyFontVariant, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
     if (!fontWeightParsed)
         addProperty(CSSPropertyFontWeight, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
-    if (!fontStretchParsed)
-        addProperty(CSSPropertyFontStretch, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
 
     // Now a font size _must_ come.
     // <absolute-size> | <relative-size> | <length> | <percentage> | inherit
@@ -4809,16 +4798,6 @@
     return false;
 }
 
-bool CSSPropertyParser::parseFontStretch(bool important)
-{
-    CSSParserValue* value = m_valueList->current();
-    if (value->id == CSSValueNormal || (value->id >= CSSValueUltraCondensed && value->id <= CSSValueUltraExpanded)) {
-        addProperty(CSSPropertyFontStretch, cssValuePool().createIdentifierValue(value->id), important);
-        return true;
-    }
-    return false;
-}
-
 bool CSSPropertyParser::parseFontFaceSrcURI(CSSValueList* valueList)
 {
     RefPtrWillBeRawPtr<CSSFontFaceSrcValue> uriValue(CSSFontFaceSrcValue::create(completeURL(m_valueList->current()->string)));