Index: ui/gfx/platform_font_linux.h |
diff --git a/ui/gfx/platform_font_linux.h b/ui/gfx/platform_font_linux.h |
index 52c4bceb76e82e590d5cd4aaa158a19a29b5b4ad..bf8fe3c61188b8309526eadff9ba906f861220e5 100644 |
--- a/ui/gfx/platform_font_linux.h |
+++ b/ui/gfx/platform_font_linux.h |
@@ -41,8 +41,11 @@ class GFX_EXPORT PlatformFontLinux : public PlatformFont { |
#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; |
int GetBaseline() override; |
int GetCapHeight() override; |
int GetExpectedTextWidth(int length) override; |
@@ -58,18 +61,19 @@ class GFX_EXPORT PlatformFontLinux : public PlatformFont { |
PlatformFontLinux(const skia::RefPtr<SkTypeface>& typeface, |
const std::string& family, |
int size_pixels, |
- int style, |
+ bool italic, |
+ gfx::Font::Weight weight, |
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, |
+ const FontRenderParams& params); |
// Initializes this object as a copy of another PlatformFontLinux. |
void InitFromPlatformFont(const PlatformFontLinux* other); |
@@ -83,7 +87,7 @@ class GFX_EXPORT PlatformFontLinux : public PlatformFont { |
// 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 |
@@ -97,6 +101,7 @@ class GFX_EXPORT PlatformFontLinux : public PlatformFont { |
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. |