Allow various font weights in gfx.

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 <fontconfig/fontconfig.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 98 matching lines @@
         FC_FAMILY, reinterpret_cast<const FcChar8*>(it->c_str()));
   }
   if (query.pixel_size > 0)
     FcPatternAddDouble(query_pattern.get(), FC_PIXEL_SIZE, query.pixel_size);
   if (query.point_size > 0)
     FcPatternAddInteger(query_pattern.get(), FC_SIZE, query.point_size);
   if (query.style >= 0) {
     FcPatternAddInteger(query_pattern.get(), FC_SLANT,
         (query.style & Font::ITALIC) ? FC_SLANT_ITALIC : FC_SLANT_ROMAN);
     FcPatternAddInteger(query_pattern.get(), FC_WEIGHT,
-        (query.style & Font::BOLD) ? FC_WEIGHT_BOLD : FC_WEIGHT_NORMAL);
+                        (query.weight == Font::Weight::INVALID)
+                            ? static_cast<int>(Font::Weight::NORMAL)
+                            : static_cast<int>(query.weight));
   }
 
   FcConfigSubstitute(NULL, query_pattern.get(), FcMatchPattern);
   FcDefaultSubstitute(query_pattern.get());
 
   ScopedFcPattern result_pattern;
   if (query.is_empty()) {
     // If the query was empty, call FcConfigSubstituteWithPat() to get a
     // non-family- or size-specific configuration so it can be used as the
     // default.
@@ skipping 153 matching lines @@
 float GetFontRenderParamsDeviceScaleFactor() {
   return device_scale_factor_for_internal_display;
 }
 
 void SetFontRenderParamsDeviceScaleFactor(float device_scale_factor) {
   device_scale_factor_for_internal_display = device_scale_factor;
 }
 #endif
 
 }  // namespace gfx