Allow various font weights in gfx.

ui/gfx/platform_font.h

Index: ui/gfx/platform_font.h
diff --git a/ui/gfx/platform_font.h b/ui/gfx/platform_font.h
index 58b0083c38626bac38000379e5f839016be92e4e..c86f2729e9ef378d2b47d6107b92c6bf019d158a 100644
--- a/ui/gfx/platform_font.h
+++ b/ui/gfx/platform_font.h
@@ -10,6 +10,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
+#include "ui/gfx/font.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ -33,8 +34,11 @@ class GFX_EXPORT PlatformFont : public base::RefCounted<PlatformFont> {
   // Returns a new Font derived from the existing font.
   // |size_delta| is the size in pixels to add to the current font.
   // The style parameter specifies the new style for the font, and is a
-  // bitmask of the values: BOLD, ITALIC and UNDERLINE.
-  virtual Font DeriveFont(int size_delta, int style) const = 0;
+  // bitmask of the values: ITALIC and UNDERLINE.
+  // The weight parameter specifies the desired weight of the font.
+  virtual Font DeriveFont(int size_delta,
+                          int style,
+                          gfx::Font::Weight weight) const = 0;

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

Remove gfx::

 
   // Returns the number of vertical pixels needed to display characters from
   // the specified font.  This may include some leading, i.e. height may be
@@ -43,6 +47,9 @@ class GFX_EXPORT PlatformFont : public base::RefCounted<PlatformFont> {
   // need to be revisited in the future.
   virtual int GetHeight() = 0;
 
+  // Returns the font weight.
+  virtual gfx::Font::Weight GetWeight() const = 0;

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

Remove gfx::

+
   // Returns the baseline, or ascent, of the font.
   virtual int GetBaseline() = 0;