Expand system font values during font property parsing

LayoutTests/fast/css/font-shorthand-expected.txt

Index: LayoutTests/fast/css/font-shorthand-expected.txt
diff --git a/LayoutTests/fast/css/font-shorthand-expected.txt b/LayoutTests/fast/css/font-shorthand-expected.txt
index 3c3391bbe3e527b1fe757b084b293d7e5e5a0cb5..144645d4b77b6db9f22546b7620e40e577eb8c44 100644
--- a/LayoutTests/fast/css/font-shorthand-expected.txt
+++ b/LayoutTests/fast/css/font-shorthand-expected.txt
@@ -1,5 +1,4 @@
-Test
-Font for '12px monospace':
+Longhands for font: 12px monospace
 font-style: normal
 font-variant: normal
 font-weight: normal
@@ -7,7 +6,7 @@ font-size: 12px
 line-height: normal
 font-family: monospace
 
-Font for '12px/24px serif':
+Longhands for font: 12px/24px serif
 font-style: normal
 font-variant: normal
 font-weight: normal
@@ -15,7 +14,7 @@ font-size: 12px
 line-height: 24px
 font-family: serif
 
-Font for 'normal 12px serif':
+Longhands for font: normal 12px serif
 font-style: normal
 font-variant: normal
 font-weight: normal
@@ -23,7 +22,7 @@ font-size: 12px
 line-height: normal
 font-family: serif
 
-Font for 'normal normal 12px serif':
+Longhands for font: normal normal 12px serif
 font-style: normal
 font-variant: normal
 font-weight: normal
@@ -31,7 +30,7 @@ font-size: 12px
 line-height: normal
 font-family: serif
 
-Font for 'normal normal normal 12px serif':
+Longhands for font: normal normal normal 12px serif
 font-style: normal
 font-variant: normal
 font-weight: normal
@@ -39,7 +38,7 @@ font-size: 12px
 line-height: normal
 font-family: serif
 
-Font for 'italic small-caps 12px/24px serif':
+Longhands for font: italic small-caps 12px/24px serif
 font-style: italic
 font-variant: small-caps
 font-weight: normal
@@ -47,7 +46,7 @@ font-size: 12px
 line-height: 24px
 font-family: serif
 
-Font for 'italic bold 12px/24px serif':
+Longhands for font: italic bold 12px/24px serif
 font-style: italic
 font-weight: bold
 font-variant: normal
@@ -55,7 +54,7 @@ font-size: 12px
 line-height: 24px
 font-family: serif
 
-Font for 'small-caps bold 14px/28px Arial, sans-serif':
+Longhands for font: small-caps bold 14px/28px Arial, sans-serif
 font-variant: small-caps
 font-weight: bold
 font-style: normal
@@ -63,7 +62,7 @@ font-size: 14px
 line-height: 28px
 font-family: Arial, sans-serif
 
-Font for 'italic small-caps bold 14px/28px Arial, sans-serif':
+Longhands for font: italic small-caps bold 14px/28px Arial, sans-serif
 font-style: italic
 font-variant: small-caps
 font-weight: bold
@@ -71,16 +70,96 @@ font-size: 14px
 line-height: 28px
 font-family: Arial, sans-serif
 
-Font for 'italic small-caps bold 12px/24px':
-
-Font for 'italic small-caps bold 12px':
-
-Font for 'italic small-caps bold /12px serif':
-
-Font for 'italic small-caps small-caps 12px serif':
-
-Font for 'italic italic small-caps bold 12px serif':
-
-Font for '12px/italic serif':
+Longhands for font: caption
+font-style
+font-weight
+font-size
+font-family
+font-variant
+line-height
+
+Longhands for font: icon
+font-style
+font-weight
+font-size
+font-family
+font-variant
+line-height
+
+Longhands for font: menu
+font-style
+font-weight
+font-size
+font-family
+font-variant
+line-height
+
+Longhands for font: message-box
+font-style
+font-weight
+font-size
+font-family
+font-variant
+line-height
+
+Longhands for font: small-caption
+font-style
+font-weight
+font-size
+font-family
+font-variant
+line-height
+
+Longhands for font: status-bar
+font-style
+font-weight
+font-size
+font-family
+font-variant
+line-height
+
+Longhands for font: -webkit-mini-control
+font-style
+font-weight
+font-size
+font-family
+font-variant
+line-height
+
+Longhands for font: -webkit-small-control
+font-style
+font-weight
+font-size
+font-family
+font-variant
+line-height
+
+Longhands for font: -webkit-control
+font-style
+font-weight
+font-size
+font-family
+font-variant
+line-height
+
+Longhands for font: italic small-caps bold 12px/24px
+
+Longhands for font: italic small-caps bold 12px
+
+Longhands for font: italic small-caps bold /12px serif
+
+Longhands for font: italic small-caps small-caps 12px serif
+
+Longhands for font: italic italic small-caps bold 12px serif
+
+Longhands for font: 12px/italic serif
+
+Longhands for font: caption italic
+
+Longhands for font: icon 12px
+
+Longhands for font: icon 12px serif
+
+Longhands for font: menu italic 12px