Revert 169264 "Add plumbing for font-stretch"

trunk/Source/core/css/resolver/StyleBuilderCustom.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
@@ skipping 277 matching lines @@
         break;
     case CSSValueLighter:
         state.fontBuilder().setWeight(state.parentStyle()->fontDescription().weight());
         state.fontBuilder().setWeightLighter();
         break;
     default:
         state.fontBuilder().setWeight(*primitiveValue);
     }
 }
 
-
-void StyleBuilderFunctions::applyInitialCSSPropertyFontStretch(StyleResolverState& state)
-{
-    state.fontBuilder().setStretch(FontStretchNormal);
-}
-
-void StyleBuilderFunctions::applyInheritCSSPropertyFontStretch(StyleResolverState& state)
-{
-    state.fontBuilder().setStretch(state.parentFontDescription().stretch());
-}
-
-void StyleBuilderFunctions::applyValueCSSPropertyFontStretch(StyleResolverState& state, CSSValue* value)
-{
-    if (!value->isPrimitiveValue())
-        return;
-    CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
-    switch (primitiveValue->getValueID()) {
-    case CSSValueInvalid:
-        ASSERT_NOT_REACHED();
-        break;
-    case CSSValueUltraCondensed:
-        state.fontBuilder().setStretch(FontStretchUltraCondensed);
-        break;
-    case CSSValueExtraCondensed:
-        state.fontBuilder().setStretch(FontStretchExtraCondensed);
-        break;
-    case CSSValueCondensed:
-        state.fontBuilder().setStretch(FontStretchCondensed);
-        break;
-    case CSSValueSemiCondensed:
-        state.fontBuilder().setStretch(FontStretchSemiCondensed);
-        break;
-    case CSSValueNormal:
-        state.fontBuilder().setStretch(FontStretchNormal);
-        break;
-    case CSSValueSemiExpanded:
-        state.fontBuilder().setStretch(FontStretchSemiExpanded);
-        break;
-    case CSSValueExpanded:
-        state.fontBuilder().setStretch(FontStretchExpanded);
-        break;
-    case CSSValueExtraExpanded:
-        state.fontBuilder().setStretch(FontStretchExtraExpanded);
-        break;
-    case CSSValueUltraExpanded:
-        state.fontBuilder().setStretch(FontStretchUltraExpanded);
-        break;
-    default:
-        return;
-    }
-}
-
 void StyleBuilderFunctions::applyValueCSSPropertyLineHeight(StyleResolverState& state, CSSValue* value)
 {
     if (!value->isPrimitiveValue())
         return;
 
     CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
     Length lineHeight;
 
     if (primitiveValue->getValueID() == CSSValueNormal) {
         lineHeight = RenderStyle::initialLineHeight();
@@ skipping 1195 matching lines @@
     case CSSPropertyWebkitLogicalHeight:
     case CSSPropertyWebkitMinLogicalWidth:
     case CSSPropertyWebkitMinLogicalHeight:
     case CSSPropertyWebkitMaxLogicalWidth:
     case CSSPropertyWebkitMaxLogicalHeight:
     {
         CSSPropertyID newId = CSSProperty::resolveDirectionAwareProperty(id, state.style()->direction(), state.style()->writingMode());
         ASSERT(newId != id);
         return applyProperty(newId, state, value);
     }
+    case CSSPropertyFontStretch:
     case CSSPropertyPage:
     case CSSPropertyTextLineThroughColor:
     case CSSPropertyTextLineThroughMode:
     case CSSPropertyTextLineThroughStyle:
     case CSSPropertyTextLineThroughWidth:
     case CSSPropertyTextOverlineColor:
     case CSSPropertyTextOverlineMode:
     case CSSPropertyTextOverlineStyle:
     case CSSPropertyTextOverlineWidth:
     case CSSPropertyTextUnderlineColor:
@@ skipping 273 matching lines @@
     case CSSPropertyColor:
     case CSSPropertyCounterIncrement:
     case CSSPropertyCounterReset:
     case CSSPropertyCursor:
     case CSSPropertyDirection:
     case CSSPropertyDisplay:
     case CSSPropertyEmptyCells:
     case CSSPropertyFloat:
     case CSSPropertyFontKerning:
     case CSSPropertyFontSize:
-    case CSSPropertyFontStretch:
     case CSSPropertyFontStyle:
     case CSSPropertyFontVariant:
     case CSSPropertyFontVariantLigatures:
     case CSSPropertyFontWeight:
     case CSSPropertyHeight:
     case CSSPropertyImageRendering:
     case CSSPropertyIsolation:
     case CSSPropertyLeft:
     case CSSPropertyLetterSpacing:
     case CSSPropertyLineHeight:
@@ skipping 360 matching lines @@
         break;
     }
     case CSSPropertyEnableBackground:
         // Silently ignoring this property for now
         // http://bugs.webkit.org/show_bug.cgi?id=6022
         break;
     }
 }
 
 } // namespace WebCore