Allow various font weights in gfx.

ui/gfx/platform_font_linux.h

 // 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.
 
 #ifndef UI_GFX_PLATFORM_FONT_LINUX_H_
 #define UI_GFX_PLATFORM_FONT_LINUX_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 23 matching lines @@
   // the locale has changed.
   static void ReloadDefaultFont();
 
 #if defined(OS_CHROMEOS)
   // Sets the default font. |font_description| is a gfx::FontList font
   // description; only the first family will be used.
   static void SetDefaultFontDescription(const std::string& font_description);
 #endif
 
   // Overridden from PlatformFont:
-  Font DeriveFont(int size_delta, int style) const override;
+  Font DeriveFont(int size_delta,
+                  int style,
+                  gfx::Font::Weight weight) const override;
   int GetHeight() override;
+  gfx::Font::Weight GetWeight() const override;

[Alexei Svitkine (slow), 2016/04/04 16:34:51]

Remove gfx:: since this in gfx:: namespace. Please fix throughout.

[Mikus, 2016/04/05 16:18:34]

Done.

   int GetBaseline() override;
   int GetCapHeight() override;
   int GetExpectedTextWidth(int length) override;
   int GetStyle() const override;
   const std::string& GetFontName() const override;
   std::string GetActualFontNameForTesting() const override;
   int GetFontSize() const override;
   const FontRenderParams& GetFontRenderParams() override;
 
  private:
   // Create a new instance of this object with the specified properties. Called
   // from DeriveFont.
   PlatformFontLinux(const skia::RefPtr<SkTypeface>& typeface,
                     const std::string& family,
                     int size_pixels,
-                    int style,
+                    bool italic,
+                    gfx::Font::Weight weight,

[Alexei Svitkine (slow), 2016/04/04 16:34:51]

Remove gfx::

[Mikus, 2016/04/05 16:18:34]

Done.

                     const FontRenderParams& params);
   ~PlatformFontLinux() override;
 
   // Initializes this object based on the passed-in details. If |typeface| is
   // empty, a new typeface will be loaded.
-  void InitFromDetails(
-      const skia::RefPtr<SkTypeface>& typeface,
-      const std::string& font_family,
-      int font_size_pixels,
-      int style,
-      const FontRenderParams& params);
+  void InitFromDetails(const skia::RefPtr<SkTypeface>& typeface,
+                       const std::string& font_family,
+                       int font_size_pixels,
+                       bool italic,
+                       gfx::Font::Weight weight,

[Alexei Svitkine (slow), 2016/04/04 16:34:51]

Remove gfx::

[Mikus, 2016/04/05 16:18:34]

Done.

+                       const FontRenderParams& params);
 
   // Initializes this object as a copy of another PlatformFontLinux.
   void InitFromPlatformFont(const PlatformFontLinux* other);
 
   // Computes the metrics if they have not yet been computed.
   void ComputeMetricsIfNecessary();
 
   skia::RefPtr<SkTypeface> typeface_;
 
   // Additional information about the face.
   // Skia actually expects a family name and not a font name.
   std::string font_family_;
   int font_size_pixels_;
-  int style_;
+  bool italic_;
 #if defined(OS_CHROMEOS)
   float device_scale_factor_;
 #endif
 
   // Information describing how the font should be rendered.
   FontRenderParams font_render_params_;
 
   // Cached metrics, generated on demand.
   bool metrics_need_computation_ = true;
   int ascent_pixels_;
   int height_pixels_;
   int cap_height_pixels_;
   double average_width_pixels_;
+  gfx::Font::Weight weight_;
 
 #if defined(OS_CHROMEOS)
   // A font description string of the format used by gfx::FontList.
   static std::string* default_font_description_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(PlatformFontLinux);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_PLATFORM_FONT_LINUX_H_