Remove more dead code in applyProperty(CSSPropertyFont)

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 1158 matching lines @@
             state.style()->setQuotes(quotes);
             return;
         }
         if (primitiveValue) {
             if (primitiveValue->getValueID() == CSSValueNone)
                 state.style()->setQuotes(QuotesData::create());
         }
         return;
     // Shorthand properties.
     case CSSPropertyFont:
-        // Short-hand properties are expanded by the parser and normally
-        // do not go through applyProperty() at all. CSSPropertyFont
-        // is special as system font names are sent through here.
-        // FIXME: Unclear why this special casing is handled this way.
-        // See isExpandedShorthand for more comments.
+        // Only System Font identifiers should come through this method
+        // all other values should have been handled when the shorthand
+        // was expanded by the parser.
+        // FIXME: System Font identifiers should not hijack this
+        // short-hand CSSProperty like this.
         ASSERT(!isInitial);
         ASSERT(!isInherit);
-        if (primitiveValue) {
-            state.style()->setLineHeight(RenderStyle::initialLineHeight());
-            state.setLineHeightValue(0);
-            state.fontBuilder().fromSystemFont(primitiveValue->getValueID(), state.style()->effectiveZoom());
-        } else if (value->isFontValue()) {
-            FontValue* font = static_cast<FontValue*>(value);
-            if (!font->style || !font->variant || !font->weight
-                || !font->size || !font->lineHeight || !font->family)
-                return;
-            styleResolver->applyProperty(CSSPropertyFontStyle, font->style.get());
-            styleResolver->applyProperty(CSSPropertyFontVariant, font->variant.get());
-            styleResolver->applyProperty(CSSPropertyFontWeight, font->weight.get());
-            // The previous properties can dirty our font but they don't try to read the font's
-            // properties back, which is safe. However if font-size is using the 'ex' unit, it will
-            // need query the dirtied font's x-height to get the computed size. To be safe in this
-            // case, let's just update the font now.
-            styleResolver->updateFont();
-            styleResolver->applyProperty(CSSPropertyFontSize, font->size.get());
-
-            state.setLineHeightValue(font->lineHeight.get());
-
-            styleResolver->applyProperty(CSSPropertyFontFamily, font->family.get());
-        }
+        ASSERT(primitiveValue);
+        state.style()->setLineHeight(RenderStyle::initialLineHeight());
+        state.setLineHeightValue(0);
+        state.fontBuilder().fromSystemFont(primitiveValue->getValueID(), state.style()->effectiveZoom());
         return;
     case CSSPropertyBackground:
     case CSSPropertyBackgroundPosition:
     case CSSPropertyBackgroundRepeat:
     case CSSPropertyBorder:
     case CSSPropertyBorderBottom:
     case CSSPropertyBorderColor:
     case CSSPropertyBorderImage:
     case CSSPropertyBorderLeft:
     case CSSPropertyBorderRadius:
@@ skipping 1018 matching lines @@
     case CSSPropertyMaskType: {
         HANDLE_SVG_INHERIT_AND_INITIAL(maskType, MaskType)
         if (primitiveValue)
             state.style()->accessSVGStyle()->setMaskType(*primitiveValue);
         break;
     }
     }
 }
 
 } // namespace WebCore