Expand system font values during font property parsing

Source/core/rendering/RenderThemeChromiumFontProviderWin.cpp

 /*
  * Copyright (C) 2012 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 24 matching lines @@
 #include "wtf/text/WTFString.h"
 
 #define SIZEOF_STRUCT_WITH_SPECIFIED_LAST_MEMBER(structName, member) \
     offsetof(structName, member) + \
     (sizeof static_cast<structName*>(0)->member)
 #define NONCLIENTMETRICS_SIZE_PRE_VISTA \
     SIZEOF_STRUCT_WITH_SPECIFIED_LAST_MEMBER(NONCLIENTMETRICS, lfMessageFont)
 
 namespace WebCore {
 
-static FontDescription& smallSystemFont()
-{
-    DEFINE_STATIC_LOCAL(FontDescription, font, ());
-    return font;
-}
-
-static FontDescription& menuFont()
-{
-    DEFINE_STATIC_LOCAL(FontDescription, font, ());
-    return font;
-}
-
-static FontDescription& labelFont()
-{
-    DEFINE_STATIC_LOCAL(FontDescription, font, ());
-    return font;
-}
-
 // Converts |points| to pixels. One point is 1/72 of an inch.
 static float pointsToPixels(float points)
 {
     static float pixelsPerInch = 0.0f;
     if (!pixelsPerInch) {
         HWndDC hdc(0); // What about printing? Is this the right DC?
         if (hdc) // Can this ever actually be 0?
             pixelsPerInch = GetDeviceCaps(hdc, LOGPIXELSY);
         else
             pixelsPerInch = 96.0f;
@@ skipping 39 matching lines @@
     // FIXME: http://b/1119883 Since this is only used for "small caption",
     // "menu", and "status bar" objects, I'm not sure how much this even
     // matters. Plus the Gecko patch went in back in 2002, and maybe this
     // isn't even relevant anymore. We should investigate whether this should
     // be removed, or perhaps broadened to be "any CJK locale".
     //
     return ((size < 12.0f) && (GetACP() == 936)) ? 12.0f : size;
 }
 
 // static
-void RenderThemeChromiumFontProvider::systemFont(CSSValueID valueID, FontDescription& fontDescription)
+void RenderThemeChromiumFontProvider::systemFont(CSSValueID systemFontID, FontStyle& fontStyle, FontWeight& fontWeight, float& fontSize, AtomicString& fontFamily)
 {
-    // This logic owes much to RenderThemeSafari.cpp.
-    FontDescription* cachedDesc = 0;
-    AtomicString faceName;
-    float fontSize = 0;
-    switch (valueID) {
-    case CSSValueSmallCaption:
-        cachedDesc = &smallSystemFont();
-        if (!smallSystemFont().isAbsoluteSize()) {
-            NONCLIENTMETRICS metrics;
-            getNonClientMetrics(&metrics);
-            faceName = AtomicString(metrics.lfSmCaptionFont.lfFaceName, wcslen(metrics.lfSmCaptionFont.lfFaceName));
-            fontSize = systemFontSize(metrics.lfSmCaptionFont);
-        }
+    fontStyle = FontStyleNormal;
+    fontWeight = FontWeightNormal;
+
+    switch (systemFontID) {
+    case CSSValueSmallCaption: {
+        NONCLIENTMETRICS metrics;
+        getNonClientMetrics(&metrics);
+        fontSize = systemFontSize(metrics.lfSmCaptionFont);
+        fontFamily = AtomicString(metrics.lfSmCaptionFont.lfFaceName, wcslen(metrics.lfSmCaptionFont.lfFaceName));
         break;
-    case CSSValueMenu:
-        cachedDesc = &menuFont();
-        if (!menuFont().isAbsoluteSize()) {
-            NONCLIENTMETRICS metrics;
-            getNonClientMetrics(&metrics);
-            faceName = AtomicString(metrics.lfMenuFont.lfFaceName, wcslen(metrics.lfMenuFont.lfFaceName));
-            fontSize = systemFontSize(metrics.lfMenuFont);
-        }
+    }
+    case CSSValueMenu: {
+        NONCLIENTMETRICS metrics;
+        getNonClientMetrics(&metrics);
+        fontSize = systemFontSize(metrics.lfMenuFont);
+        fontFamily = AtomicString(metrics.lfMenuFont.lfFaceName, wcslen(metrics.lfMenuFont.lfFaceName));
         break;
-    case CSSValueStatusBar:
-        cachedDesc = &labelFont();
-        if (!labelFont().isAbsoluteSize()) {
-            NONCLIENTMETRICS metrics;
-            getNonClientMetrics(&metrics);
-            faceName = metrics.lfStatusFont.lfFaceName;
-            fontSize = systemFontSize(metrics.lfStatusFont);
-        }
+    }
+    case CSSValueStatusBar: {
+        NONCLIENTMETRICS metrics;
+        getNonClientMetrics(&metrics);
+        fontSize = systemFontSize(metrics.lfStatusFont);
+        fontFamily = metrics.lfStatusFont.lfFaceName;
         break;
+    }
     case CSSValueWebkitMiniControl:
     case CSSValueWebkitSmallControl:
     case CSSValueWebkitControl:
-        faceName = defaultGUIFont();
         // Why 2 points smaller? Because that's what Gecko does.
         fontSize = s_defaultFontSize - pointsToPixels(2);
+        fontFamily = defaultGUIFont();
         break;
     default:
-        faceName = defaultGUIFont();
         fontSize = s_defaultFontSize;
+        fontFamily = defaultGUIFont();
         break;
     }
-
-    if (!cachedDesc)
-        cachedDesc = &fontDescription;
-
-    if (fontSize) {
-        cachedDesc->firstFamily().setFamily(faceName);
-        cachedDesc->setIsAbsoluteSize(true);
-        cachedDesc->setGenericFamily(FontDescription::NoFamily);
-        cachedDesc->setSpecifiedSize(fontSize);
-        cachedDesc->setWeight(FontWeightNormal);
-        cachedDesc->setStyle(false);
-    }
-    fontDescription = *cachedDesc;
 }
 
 // static
 void RenderThemeChromiumFontProvider::setDefaultFontSize(int fontSize)
 {
     s_defaultFontSize = static_cast<float>(fontSize);
-
-    // Reset cached fonts.
-    smallSystemFont() = menuFont() = labelFont() = FontDescription();
 }
 
 } // namespace WebCore