Index: Source/core/rendering/RenderThemeChromiumFontProviderLinux.cpp |
diff --git a/Source/core/rendering/RenderThemeChromiumFontProviderLinux.cpp b/Source/core/rendering/RenderThemeChromiumFontProviderLinux.cpp |
index 95ad0a503fea8ec5dbb30b54986b23551b469589..c33c24adaaf6ad213b2048a7942e0330a8582fca 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(FontStyleNormal); |
} |
} // namespace blink |