Index: ui/gfx/platform_font_win.h |
diff --git a/ui/gfx/platform_font_win.h b/ui/gfx/platform_font_win.h |
index b03ed810365f525f47137b5c916c9c54752c7dcc..b4624ab281cc6a214755a95dfac30ceebb28eede 100644 |
--- a/ui/gfx/platform_font_win.h |
+++ b/ui/gfx/platform_font_win.h |
@@ -54,11 +54,16 @@ class GFX_EXPORT PlatformFontWin : public PlatformFont { |
// The returned Font will be the largest font size with a height <= |height|, |
// since a size with the exact specified |height| may not necessarily exist. |
// GetMinimumFontSize() may impose a font size that is taller than |height|. |
- Font DeriveFontWithHeight(int height, int style); |
+ Font DeriveFontWithHeight(int height, |
msw
2016/03/22 01:53:44
This seems to only be called from unit tests. Can
|
+ int style, |
+ gfx::Font::FontWeight weight); |
// Overridden from PlatformFont: |
- Font DeriveFont(int size_delta, int style) const override; |
+ Font DeriveFont(int size_delta, |
+ int style, |
+ gfx::Font::FontWeight weight) const override; |
int GetHeight() override; |
+ gfx::Font::FontWeight GetWeight() override; |
int GetBaseline() override; |
int GetCapHeight() override; |
int GetExpectedTextWidth(int length) override; |
@@ -106,6 +111,7 @@ class GFX_EXPORT PlatformFontWin : public PlatformFont { |
int baseline, |
int cap_height, |
int ave_char_width, |
+ gfx::Font::FontWeight weight, |
int style); |
// Accessors |
@@ -114,6 +120,7 @@ class GFX_EXPORT PlatformFontWin : public PlatformFont { |
int baseline() const { return baseline_; } |
int cap_height() const { return cap_height_; } |
int ave_char_width() const { return ave_char_width_; } |
+ gfx::Font::FontWeight weight() const { return weight_; } |
int style() const { return style_; } |
const std::string& font_name() const { return font_name_; } |
int font_size() const { return font_size_; } |
@@ -140,6 +147,7 @@ class GFX_EXPORT PlatformFontWin : public PlatformFont { |
const int baseline_; |
const int cap_height_; |
const int ave_char_width_; |
+ const gfx::Font::FontWeight weight_; |
const int style_; |
// Average character width in dialog units. This is queried lazily from the |
// system, with an initial value of -1 meaning it hasn't yet been queried. |