Make GetCustomFontRenderParams() pass font style.

ui/gfx/font_render_params_linux.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/font_render_params.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "ui/gfx/font.h"
 #include "ui/gfx/linux_font_delegate.h"
 #include "ui/gfx/switches.h"
 
 #include <fontconfig/fontconfig.h>
 
 namespace gfx {
 
 namespace {
 
 // Converts Fontconfig FC_HINT_STYLE to FontRenderParams::Hinting.
@@ skipping 16 matching lines @@
     default:           return FontRenderParams::SUBPIXEL_RENDERING_NONE;
   }
 }
 
 // Queries Fontconfig for rendering settings and updates |params_out| and
 // |family_out| (if non-NULL). Returns false on failure. See
 // GetCustomFontRenderParams() for descriptions of arguments.
 bool QueryFontconfig(const std::vector<std::string>* family_list,
                      const int* pixel_size,
                      const int* point_size,
+                     const int* style,
                      FontRenderParams* params_out,
                      std::string* family_out) {
   FcPattern* pattern = FcPatternCreate();
   CHECK(pattern);
 
   if (family_list) {
     for (std::vector<std::string>::const_iterator it = family_list->begin();
          it != family_list->end(); ++it) {
       FcPatternAddString(
           pattern, FC_FAMILY, reinterpret_cast<const FcChar8*>(it->c_str()));
     }
   }
   if (pixel_size)
     FcPatternAddDouble(pattern, FC_PIXEL_SIZE, *pixel_size);
   if (point_size)
     FcPatternAddInteger(pattern, FC_SIZE, *point_size);
+  if (style) {
+    FcPatternAddInteger(pattern, FC_SLANT,
+        (*style & Font::ITALIC) ? FC_SLANT_ITALIC : FC_SLANT_ROMAN);
+    FcPatternAddInteger(pattern, FC_WEIGHT,
+        (*style & Font::BOLD) ? FC_WEIGHT_BOLD : FC_WEIGHT_NORMAL);
+  }
 
   FcConfigSubstitute(NULL, pattern, FcMatchPattern);
   FcDefaultSubstitute(pattern);
   FcResult result;
   FcPattern* match = FcFontMatch(NULL, pattern, &result);
   FcPatternDestroy(pattern);
   if (!match)
     return false;
 
   if (family_out) {
@@ skipping 21 matching lines @@
 
     int fc_rgba = FC_RGBA_NONE;
     FcPatternGetInteger(match, FC_RGBA, 0, &fc_rgba);
     params_out->subpixel_rendering = ConvertFontconfigRgba(fc_rgba);
   }
 
   FcPatternDestroy(match);
   return true;
 }
 
-// Initializes |params| with the system's default settings.
-void LoadDefaults(FontRenderParams* params, bool for_web_contents) {
-  *params = GetCustomFontRenderParams(for_web_contents, NULL, NULL, NULL, NULL);
+// Returns the system's default settings.
+FontRenderParams LoadDefaults(bool for_web_contents) {
+  return GetCustomFontRenderParams(
+      for_web_contents, NULL, NULL, NULL, NULL, NULL);
 }
 
 }  // namespace
 
 const FontRenderParams& GetDefaultFontRenderParams() {
-  static bool loaded_defaults = false;
-  static FontRenderParams default_params;
-  if (!loaded_defaults)
-    LoadDefaults(&default_params, /* for_web_contents */ false);
-  loaded_defaults = true;
+  static FontRenderParams default_params = LoadDefaults(false);
   return default_params;
 }
 
 const FontRenderParams& GetDefaultWebKitFontRenderParams() {
-  static bool loaded_defaults = false;
-  static FontRenderParams default_params;
-  if (!loaded_defaults)
-    LoadDefaults(&default_params, /* for_web_contents */ true);
-  loaded_defaults = true;
+  static FontRenderParams default_params = LoadDefaults(true);
   return default_params;
 }
 
 FontRenderParams GetCustomFontRenderParams(
     bool for_web_contents,
     const std::vector<std::string>* family_list,
     const int* pixel_size,
     const int* point_size,
+    const int* style,
     std::string* family_out) {
   if (family_out)
     family_out->clear();
 
   // Start with the delegate's settings, but let Fontconfig have the final say.
   FontRenderParams params;
   const LinuxFontDelegate* delegate = LinuxFontDelegate::instance();
   if (delegate)
     params = delegate->GetDefaultFontRenderParams();
-  QueryFontconfig(family_list, pixel_size, point_size, &params, family_out);
+  QueryFontconfig(
+      family_list, pixel_size, point_size, style, &params, family_out);
 
   // Fontconfig doesn't support configuring subpixel positioning; check a flag.
   params.subpixel_positioning = CommandLine::ForCurrentProcess()->HasSwitch(
       for_web_contents ?
       switches::kEnableWebkitTextSubpixelPositioning :
       switches::kEnableBrowserTextSubpixelPositioning);
 
   // To enable subpixel positioning, we need to disable hinting.
   if (params.subpixel_positioning)
     params.hinting = FontRenderParams::HINTING_NONE;
 
   // Use the first family from the list if Fontconfig didn't suggest a family.
   if (family_out && family_out->empty() &&
       family_list && !family_list->empty())
     *family_out = (*family_list)[0];
 
   return params;
 }
 
 }  // namespace gfx