Expand the "font" shorthand when specified using a system font keyword.

Source/core/css/parser/CSSPropertyParser.cpp

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
@@ skipping 37 matching lines @@
 #include "core/css/CSSGridTemplateAreasValue.h"
 #include "core/css/CSSImageSetValue.h"
 #include "core/css/CSSImageValue.h"
 #include "core/css/CSSInheritedValue.h"
 #include "core/css/CSSInitialValue.h"
 #include "core/css/CSSKeyframeRule.h"
 #include "core/css/CSSKeyframesRule.h"
 #include "core/css/CSSLineBoxContainValue.h"
 #include "core/css/CSSParserValues.h"
 #include "core/css/CSSPrimitiveValue.h"
+#include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSPropertySourceData.h"
 #include "core/css/CSSReflectValue.h"
 #include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSSelector.h"
 #include "core/css/CSSShadowValue.h"
 #include "core/css/CSSTimingFunctionValue.h"
 #include "core/css/CSSTransformValue.h"
 #include "core/css/CSSUnicodeRangeValue.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/CSSValuePool.h"
@@ skipping 1338 matching lines @@
         // <margin-width>{1,4} | inherit
         return parse4Values(propId, marginShorthand().properties(), important);
     case CSSPropertyPadding:
         // <padding-width>{1,4} | inherit
         return parse4Values(propId, paddingShorthand().properties(), important);
     case CSSPropertyFlexFlow:
         return parseShorthand(propId, flexFlowShorthand(), important);
     case CSSPropertyFont:
         // [ [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [ / 'line-height' ]?
         // 'font-family' ] | caption | icon | menu | message-box | small-caption | status-bar | inherit
-        if (id >= CSSValueCaption && id <= CSSValueStatusBar)
-            validPrimitive = true;
-        else
-            return parseFont(important);
-        break;
+        if (num == 1 && id >= CSSValueCaption && id <= CSSValueStatusBar)
+            return parseKeywordBasedFont(important);
+        return parseFont(important);
     case CSSPropertyListStyle:
         return parseShorthand(propId, listStyleShorthand(), important);
     case CSSPropertyWebkitColumns:
         return parseColumnsShorthand(important);
     case CSSPropertyWebkitColumnRule:
         return parseShorthand(propId, webkitColumnRuleShorthand(), important);
     case CSSPropertyWebkitTextStroke:
         return parseShorthand(propId, webkitTextStrokeShorthand(), important);
     case CSSPropertyAnimation:
         if (!RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled())
@@ skipping 3081 matching lines @@
         shape = parseBasicShapeInset(args);
 
     if (!shape)
         return nullptr;
 
     m_valueList->next();
 
     return cssValuePool().createValue(shape.release());
 }
 
+// [ 'caption' | 'icon' | 'menu' | 'message-box' | 'small-caption' | 'status-bar' | '-webkit-mini-control' | '-webkit-small-control' | '-webkit-control' ]
+bool CSSPropertyParser::parseKeywordBasedFont(bool important)
+{
+    ASSERT(m_valueList->size() == 1);
+
+    CSSParserValue* value = m_valueList->valueAt(0);
+    CSSValueID id = value->id;
+    ASSERT(id >= CSSValueCaption && id <= CSSValueStatusBar);
+
+    FontDescription fontDescription;
+    RenderTheme::theme().systemFont(id, fontDescription);
+    RefPtr<CSSValueList> familyList = CSSValueList::createCommaSeparated();
+    familyList->append(cssValuePool().createFontFamilyValue(fontDescription.firstFamily().family()));
+
+    ShorthandScope scope(this, CSSPropertyFont);
+    addProperty(CSSPropertyFontFamily, familyList, important, false);
+    addProperty(CSSPropertyFontStyle, cssValuePool().createIdentifierValue(fontDescription.style() == FontStyleItalic ? CSSValueItalic : CSSValueNormal), important, false);
+    addProperty(CSSPropertyFontVariant, cssValuePool().createIdentifierValue(fontDescription.variant() == FontVariantSmallCaps ? CSSValueSmallCaps : CSSValueNormal), important, false);
+    addProperty(CSSPropertyFontWeight, cssValuePool().createValue(fontDescription.weight()), important, false);
+    CSSParserValue fontSizeValue;
+    fontSizeValue.setFromNumber(fontDescription.specifiedSize(), CSSPrimitiveValue::CSS_PX);
+    addProperty(CSSPropertyFontSize, parseValidPrimitive(fontSizeValue.id, &fontSizeValue), important, false);
+    addProperty(CSSPropertyLineHeight, cssValuePool().createIdentifierValue(CSSValueNormal), important, false);
+
+    return true;
+}
+
 // [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [ / 'line-height' ]? 'font-family'
 bool CSSPropertyParser::parseFont(bool important)
 {
     // Let's check if there is an inherit or initial somewhere in the shorthand.
     for (unsigned i = 0; i < m_valueList->size(); ++i) {
         if (m_valueList->valueAt(i)->id == CSSValueInherit || m_valueList->valueAt(i)->id == CSSValueInitial)
             return false;
     }
 
     ShorthandScope scope(this, CSSPropertyFont);
@@ skipping 3921 matching lines @@
         parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
     if (!seenStroke)
         parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke));
     if (!seenMarkers)
         parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers));
 
     return parsedValues.release();
 }
 
 } // namespace WebCore