Expand system font values during font property parsing

Source/core/rendering/RenderThemeChromiumFontProviderLinux.cpp

Index: Source/core/rendering/RenderThemeChromiumFontProviderLinux.cpp
diff --git a/Source/core/rendering/RenderThemeChromiumFontProviderLinux.cpp b/Source/core/rendering/RenderThemeChromiumFontProviderLinux.cpp
index b26db49aa1f6277d8d3ddbfa872a8a81856aee77..2da835eb7dc9dec3fcb7c500242c10bac2c19c21 100644
--- a/Source/core/rendering/RenderThemeChromiumFontProviderLinux.cpp
+++ b/Source/core/rendering/RenderThemeChromiumFontProviderLinux.cpp
@@ -41,11 +41,14 @@ void RenderThemeChromiumFontProvider::setDefaultFontSize(int fontSize)
 }
 
 // static
-void RenderThemeChromiumFontProvider::systemFont(CSSValueID valueID, FontDescription& fontDescription)
+void RenderThemeChromiumFontProvider::systemFont(CSSValueID systemFontID, FontStyle& fontStyle, FontWeight& fontWeight, float& fontSize, AtomicString& fontFamily)
 {
-    float fontSize = s_defaultFontSize;
+    fontWeight = FontWeightNormal;
+    fontStyle = FontStyleNormal;
+    fontSize = s_defaultFontSize;
+    fontFamily = defaultGUIFont();
 
-    switch (valueID) {
+    switch (systemFontID) {
     case CSSValueWebkitMiniControl:
     case CSSValueWebkitSmallControl:
     case CSSValueWebkitControl:
@@ -59,13 +62,6 @@ void RenderThemeChromiumFontProvider::systemFont(CSSValueID valueID, FontDescrip
     default:
         break;
     }
-
-    fontDescription.firstFamily().setFamily(defaultGUIFont());
-    fontDescription.setSpecifiedSize(fontSize);
-    fontDescription.setIsAbsoluteSize(true);
-    fontDescription.setGenericFamily(FontDescription::NoFamily);
-    fontDescription.setWeight(FontWeightNormal);
-    fontDescription.setStyle(false);
 }
 
 } // namespace WebCore