Allow various font weights in gfx.

ui/gfx/font_render_params_linux_unittest.cc

 // Copyright 2014 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/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "build/build_config.h"
@@ skipping 11 matching lines @@
 class TestFontDelegate : public LinuxFontDelegate {
  public:
   TestFontDelegate() {}
   ~TestFontDelegate() override {}
 
   void set_params(const FontRenderParams& params) { params_ = params; }
 
   FontRenderParams GetDefaultFontRenderParams() const override {
     return params_;
   }
-  void GetDefaultFontDescription(
-      std::string* family_out,
-      int* size_pixels_out,
-      int* style_out,
-      FontRenderParams* params_out) const override {
+  void GetDefaultFontDescription(std::string* family_out,
+                                 int* size_pixels_out,
+                                 bool* italic_out,
+                                 Font::Weight* weight_out,
+                                 FontRenderParams* params_out) const override {
     NOTIMPLEMENTED();
   }
 
  private:
   FontRenderParams params_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFontDelegate);
 };
 
 }  // namespace
@@ skipping 140 matching lines @@
       kFontconfigMatchFooter +
       kFontconfigFileFooter));
 
   FontRenderParamsQuery query;
   query.style = Font::NORMAL;
   FontRenderParams params = GetFontRenderParams(query, NULL);
   EXPECT_EQ(FontRenderParams::HINTING_SLIGHT, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_RGB,
             params.subpixel_rendering);
 
-  query.style = Font::BOLD;
+  query.weight = Font::Weight::BOLD;
   params = GetFontRenderParams(query, NULL);
   EXPECT_EQ(FontRenderParams::HINTING_SLIGHT, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_NONE,
             params.subpixel_rendering);
 
+  query.weight = Font::Weight::NORMAL;
   query.style = Font::ITALIC;
   params = GetFontRenderParams(query, NULL);
   EXPECT_EQ(FontRenderParams::HINTING_NONE, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_RGB,
             params.subpixel_rendering);
 
-  query.style = Font::BOLD | Font::ITALIC;
+  query.weight = Font::Weight::BOLD;
+  query.style = Font::ITALIC;
   params = GetFontRenderParams(query, NULL);
   EXPECT_EQ(FontRenderParams::HINTING_NONE, params.hinting);
   EXPECT_EQ(FontRenderParams::SUBPIXEL_RENDERING_NONE,
             params.subpixel_rendering);
 }
 
 TEST_F(FontRenderParamsTest, Scalable) {
   // Load a config that only enables antialiasing for scalable fonts.
   ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
       std::string(kFontconfigFileHeader) +
@@ skipping 157 matching lines @@
   EXPECT_EQ("Verdana", suggested_family);
 
   query.families.clear();
   query.families.push_back("Arial");
   suggested_family.clear();
   GetFontRenderParams(query, &suggested_family);
   EXPECT_EQ("Verdana", suggested_family);
 }
 
 }  // namespace gfx